From a7f247b472efedaf13b30fc02e9acdf6fe38795f Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Mon, 2 Aug 2021 10:28:20 -0700 Subject: [PATCH] chore: Bump Celery (#15927) Co-authored-by: John Bodley --- UPDATING.md | 2 ++ requirements/base.txt | 26 +++++++++++++++++++++----- requirements/testing.txt | 4 ---- setup.py | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/UPDATING.md b/UPDATING.md index a24280e9db016..5f3977d06385b 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -23,6 +23,8 @@ This file documents any backwards-incompatible changes in Superset and assists people when migrating to a new version. ## Next +- [15927](https://github.com/apache/superset/pull/15927): Upgrades Celery to 5.x. Per the [upgrading](https://docs.celeryproject.org/en/stable/history/whatsnew-5.0.html#upgrading-from-celery-4-x) instructions Celery 5.0 introduces a new CLI implementation which is not completely backwards compatible. Please ensure global options are positioned before the sub-command. + - [13772](https://github.com/apache/superset/pull/13772): Row level security (RLS) is now enabled by default. To activate the feature, please run `superset init` to expose the RLS menus to Admin users. - [13980](https://github.com/apache/superset/pull/13980): Data health checks no longer use the metadata database as an interim cache. Though non-breaking, deployments which implement complex logic should likely memoize the callback function. Refer to documentation in the confg.py file for more detail. diff --git a/requirements/base.txt b/requirements/base.txt index 0125e97608990..75280d8d75ac3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,7 +11,7 @@ aiohttp==3.7.2 # via slackclient alembic==1.4.3 # via flask-migrate -amqp==2.6.1 +amqp==5.0.6 # via kombu apispec[yaml]==3.3.2 # via flask-appbuilder @@ -25,7 +25,7 @@ babel==2.8.0 # via flask-babel backoff==1.10.0 # via apache-superset -billiard==3.6.3.0 +billiard==3.6.4.0 # via celery bleach==3.3.0 # via apache-superset @@ -33,7 +33,7 @@ brotli==1.0.9 # via flask-compress cachelib==0.1.1 # via apache-superset -celery==4.4.7 +celery==5.1.2 # via apache-superset cffi==1.14.3 # via cryptography @@ -42,8 +42,18 @@ chardet==3.0.4 click==7.1.2 # via # apache-superset + # celery + # click-didyoumean + # click-plugins + # click-repl # flask # flask-appbuilder +click-didyoumean==0.0.3 + # via celery +click-plugins==1.1.1 + # via celery +click-repl==0.2.0 + # via celery colorama==0.4.4 # via # apache-superset @@ -132,7 +142,7 @@ jinja2==2.11.3 # flask-babel jsonschema==3.2.0 # via flask-appbuilder -kombu==4.6.11 +kombu==5.1.0 # via celery korean-lunar-calendar==0.2.1 # via holidays @@ -180,6 +190,8 @@ polyline==1.4.0 # via apache-superset prison==0.1.3 # via flask-appbuilder +prompt-toolkit==3.0.19 + # via click-repl pyarrow==4.0.1 # via apache-superset pycparser==2.20 @@ -235,6 +247,7 @@ simplejson==3.17.2 six==1.15.0 # via # bleach + # click-repl # cryptography # flask-jwt-extended # flask-talisman @@ -272,10 +285,13 @@ typing-extensions==3.7.4.3 # apache-superset urllib3==1.25.11 # via selenium -vine==1.3.0 +vine==5.0.0 # via # amqp # celery + # kombu +wcwidth==0.2.5 + # via prompt-toolkit webencodings==0.5.1 # via bleach werkzeug==1.0.1 diff --git a/requirements/testing.txt b/requirements/testing.txt index 5b736e38140ca..b6839a4855420 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -53,8 +53,6 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -prompt-toolkit==3.0.8 - # via ipython ptyprocess==0.6.0 # via pexpect pyfakefs==4.4.0 @@ -80,8 +78,6 @@ statsd==3.3.0 # via -r requirements/testing.in traitlets==5.0.5 # via ipython -wcwidth==0.2.5 - # via prompt-toolkit websocket-client==0.57.0 # via docker diff --git a/setup.py b/setup.py index a38c7d2a2d8ca..6480fc71d0bb5 100644 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ def get_git_sha() -> str: "backoff>=1.8.0", "bleach>=3.0.2, <4.0.0", "cachelib>=0.1.1,<0.2", - "celery>=4.3.0, <5.0.0, !=4.4.1", + "celery>=5.0.0, <6.0.0", "click<8", "colorama", "croniter>=0.3.28",