From 32045b0255251955e63395498dc35816bb3dfb87 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Tue, 12 Sep 2023 10:36:41 -0400 Subject: [PATCH] Upgrade requirements as celery 5.3.3 disappeared. --- requirements/base.txt | 12 ++++++------ requirements/common_constraints.txt | 5 +++++ requirements/dev.txt | 29 ++++++++++++++++++----------- requirements/doc.txt | 29 +++++++++++++---------------- requirements/pip-tools.txt | 6 +++++- requirements/pip.txt | 2 +- requirements/production.txt | 14 +++++++------- requirements/quality.txt | 12 ++++++------ requirements/test.txt | 18 +++++++++--------- requirements/validation.txt | 18 +++++++++--------- 10 files changed, 79 insertions(+), 66 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e1d4c6f0..01597f21 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,13 +22,13 @@ backports-zoneinfo[tzdata]==0.2.1 # kombu billiard==4.1.0 # via celery -boto3==1.28.39 +boto3==1.28.45 # via django-ses -botocore==1.31.39 +botocore==1.31.45 # via # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/base.in # django-celery-results @@ -65,7 +65,7 @@ defusedxml==0.7.1 # via # python3-openid # social-auth-core -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -230,7 +230,7 @@ python-slugify==8.0.1 # via code-annotations python3-openid==3.2.0 # via social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.in # django @@ -271,7 +271,7 @@ six==1.16.0 # python-dateutil slumber==0.7.1 # via edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via edx-auth-backends social-auth-core==4.4.2 # via diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34d..fbd264b4 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,6 +3,11 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints +# This is a temporary solution to override the real common_constraints.txt +# In edx-lint, until the pyjwt constraint in edx-lint has been removed. +# See BOM-2721 for more details. +# Below is the copied and edited version of common_constraints + # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/dev.txt b/requirements/dev.txt index 42c8c374..9295f6be 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -39,20 +39,20 @@ billiard==4.1.0 # via # -r requirements/validation.txt # celery -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/validation.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/validation.txt # boto3 # s3transfer -build==0.10.0 +build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools -celery==5.3.3 +celery==5.3.4 # via # -r requirements/validation.txt # django-celery-results @@ -104,7 +104,7 @@ code-annotations==1.5.0 # -r requirements/validation.txt # edx-lint # edx-toggles -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/validation.txt # pytest-cov @@ -130,7 +130,7 @@ dill==0.3.7 # via # -r requirements/validation.txt # pylint -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/validation.txt @@ -263,7 +263,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/validation.txt -faker==19.3.1 +faker==19.6.1 # via # -r requirements/validation.txt # factory-boy @@ -275,6 +275,10 @@ idna==3.4 # via # -r requirements/validation.txt # requests +importlib-metadata==6.8.0 + # via + # -r requirements/pip-tools.txt + # build inflect==7.0.0 # via # -r requirements/dev.in @@ -439,7 +443,7 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements/validation.txt # pytest-cov @@ -465,7 +469,7 @@ python3-openid==3.2.0 # via # -r requirements/validation.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/validation.txt # django @@ -526,7 +530,7 @@ snowballstemmer==2.2.0 # via # -r requirements/validation.txt # pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/validation.txt # edx-auth-backends @@ -615,7 +619,10 @@ wrapt==1.11.2 # -r requirements/validation.txt # astroid zipp==3.16.2 - # via -r requirements/validation.txt + # via + # -r requirements/pip-tools.txt + # -r requirements/validation.txt + # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index 60b09444..6e506826 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -47,18 +47,16 @@ billiard==4.1.0 # via # -r requirements/test.txt # celery -bleach==6.0.0 - # via readme-renderer -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/test.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/test.txt # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/test.txt # django-celery-results @@ -108,7 +106,7 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov @@ -128,7 +126,7 @@ dill==0.3.7 # via # -r requirements/test.txt # pylint -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/test.txt @@ -262,7 +260,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.3.1 +faker==19.6.1 # via # -r requirements/test.txt # factory-boy @@ -328,6 +326,8 @@ newrelic==9.0.0 # via # -r requirements/test.txt # edx-django-utils +nh3==0.2.14 + # via readme-renderer oauthlib==3.2.2 # via # -r requirements/test.txt @@ -414,7 +414,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements/test.txt # pytest-cov @@ -440,7 +440,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/test.txt # babel @@ -453,7 +453,7 @@ pyyaml==6.0.1 # -r requirements/test.txt # code-annotations # drf-yasg -readme-renderer==41.0 +readme-renderer==42.0 # via -r requirements/doc.in redis==5.0.0 # via -r requirements/test.txt @@ -489,7 +489,6 @@ six==1.16.0 # via # -r requirements/test.txt # analytics-python - # bleach # djangorestframework-csv # edx-auth-backends # edx-drf-extensions @@ -502,7 +501,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via sphinx -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/test.txt # edx-auth-backends @@ -511,7 +510,7 @@ social-auth-core==4.4.2 # -r requirements/test.txt # edx-auth-backends # social-auth-app-django -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sphinx==6.2.1 # via @@ -596,8 +595,6 @@ wcwidth==0.2.6 # via # -r requirements/test.txt # prompt-toolkit -webencodings==0.5.1 - # via bleach wrapt==1.11.2 # via # -c requirements/constraints.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 007ed388..d2e8e4e5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,10 +4,12 @@ # # make upgrade # -build==0.10.0 +build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools +importlib-metadata==6.8.0 + # via build packaging==23.1 # via build pip-tools==7.3.0 @@ -21,6 +23,8 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools +zipp==3.16.2 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 13c7e845..a53f711a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.41.2 # The following packages are considered to be unsafe in a requirements file: pip==23.2.1 # via -r requirements/pip.in -setuptools==68.1.2 +setuptools==68.2.1 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 0040a230..dd04c3b3 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -31,16 +31,16 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/base.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/base.txt # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/base.txt # django-celery-results @@ -93,7 +93,7 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -206,7 +206,7 @@ edx-rest-api-client==5.6.0 # via -r requirements/base.txt edx-toggles==5.1.0 # via -r requirements/base.txt -gevent==23.7.0 +gevent==23.9.0.post1 # via -r requirements/production.in greenlet==2.0.2 # via gevent @@ -314,7 +314,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # django @@ -368,7 +368,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/quality.txt b/requirements/quality.txt index 613e378a..f1d4f89d 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -36,16 +36,16 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/base.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/base.txt # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/base.txt # django-celery-results @@ -105,7 +105,7 @@ defusedxml==0.7.1 # social-auth-core dill==0.3.7 # via pylint -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -350,7 +350,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # django @@ -405,7 +405,7 @@ slumber==0.7.1 # edx-rest-api-client snowballstemmer==2.2.0 # via pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/test.txt b/requirements/test.txt index 3846d382..60231b96 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -36,16 +36,16 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/base.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/base.txt # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/base.txt # django-celery-results @@ -94,7 +94,7 @@ code-annotations==1.5.0 # -r requirements/test.in # edx-lint # edx-toggles -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.in # pytest-cov @@ -112,7 +112,7 @@ defusedxml==0.7.1 # social-auth-core dill==0.3.7 # via pylint -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -235,7 +235,7 @@ exceptiongroup==1.1.3 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==19.3.1 +faker==19.6.1 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -351,7 +351,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.4.0 +pytest==7.4.2 # via # pytest-cov # pytest-django @@ -376,7 +376,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # django @@ -429,7 +429,7 @@ slumber==0.7.1 # via # -r requirements/base.txt # edx-rest-api-client -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/validation.txt b/requirements/validation.txt index 11503190..a72a9bdd 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -46,18 +46,18 @@ billiard==4.1.0 # -r requirements/quality.txt # -r requirements/test.txt # celery -boto3==1.28.39 +boto3==1.28.45 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.31.39 +botocore==1.31.45 # via # -r requirements/quality.txt # -r requirements/test.txt # boto3 # s3transfer -celery==5.3.3 +celery==5.3.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -117,7 +117,7 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov @@ -140,7 +140,7 @@ dill==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # pylint -django==3.2.20 +django==3.2.21 # via # -c requirements/common_constraints.txt # -r requirements/quality.txt @@ -314,7 +314,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.3.1 +faker==19.6.1 # via # -r requirements/test.txt # factory-boy @@ -489,7 +489,7 @@ pynacl==1.5.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements/test.txt # pytest-cov @@ -518,7 +518,7 @@ python3-openid==3.2.0 # -r requirements/quality.txt # -r requirements/test.txt # social-auth-core -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -591,7 +591,7 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -social-auth-app-django==5.2.0 +social-auth-app-django==5.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt