From f3d57a4cbbdb2bb047203ac9d49aacf3aac09e63 Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com> Date: Fri, 6 Oct 2023 01:41:04 +0500 Subject: [PATCH] Revert "feat!: Upgrade to Django 4.2" --- .github/workflows/ci.yml | 2 +- Makefile | 6 ++-- license_manager/settings/base.py | 5 --- requirements/base.txt | 40 +++++++++++----------- requirements/common_constraints.txt | 2 +- requirements/constraints.txt | 5 --- requirements/dev.txt | 52 ++++++++++++++--------------- requirements/doc.txt | 52 ++++++++++++++--------------- requirements/pip-tools.txt | 4 +-- requirements/production.txt | 44 ++++++++++++------------ requirements/quality.txt | 42 +++++++++++------------ requirements/test.txt | 48 +++++++++++++------------- requirements/validation.txt | 48 +++++++++++++------------- 13 files changed, 171 insertions(+), 179 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2578f84..49e906d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: python-version: ["3.8"] - django-version: ["pinned"] + django-version: ["pinned", "4.2"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/Makefile b/Makefile index f4bf1700..70bd581c 100644 --- a/Makefile +++ b/Makefile @@ -111,11 +111,13 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in + sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt # 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-271 for more details. - sed -i.'' 's/Django<4.0//g' requirements/common_constraints.txt - sed -i.'' 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt + sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/license_manager/settings/base.py b/license_manager/settings/base.py index 3682960d..9a235bfb 100644 --- a/license_manager/settings/base.py +++ b/license_manager/settings/base.py @@ -171,11 +171,6 @@ USE_TZ = True -# Django 4.0+ uses zoneinfo if this is not set. We can remove this and -# migrate to zoneinfo after Django 4.2 upgrade. See more on following url -# https://docs.djangoproject.com/en/4.2/releases/4.0/#zoneinfo-default-timezone-implementation -USE_DEPRECATED_PYTZ = True - LOCALE_PATHS = ( root('conf', 'locale'), ) diff --git a/requirements/base.txt b/requirements/base.txt index cce7f985..1c4c8174 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,13 +19,12 @@ backoff==1.10.0 backports-zoneinfo[tzdata]==0.2.1 # via # celery - # django # kombu billiard==4.1.0 # via celery -boto3==1.28.60 +boto3==1.28.48 # via django-ses -botocore==1.31.60 +botocore==1.31.48 # via # boto3 # s3transfer @@ -36,11 +35,11 @@ celery==5.3.4 # edx-celeryutils certifi==2023.7.22 # via requests -cffi==1.16.0 +cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via requests click==8.1.7 # via @@ -58,17 +57,17 @@ click-repl==0.3.0 # via celery code-annotations==1.5.0 # via edx-toggles -cryptography==41.0.4 +cryptography==41.0.3 # via # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # python3-openid # social-auth-core -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/base.in # django-celery-results # django-cors-headers @@ -106,7 +105,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.in django-extensions==3.2.3 # via -r requirements/base.in -django-filter==23.3 +django-filter==23.2 # via -r requirements/base.in django-log-request-id==2.1.0 # via -r requirements/base.in @@ -158,11 +157,11 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/base.in # edx-rbac -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via edx-drf-extensions edx-rbac==1.8.0 # via -r requirements/base.in @@ -190,13 +189,13 @@ monotonic==1.6 # via analytics-python mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==9.1.0 +newrelic==9.0.0 # via edx-django-utils oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via drf-yasg pbr==5.11.1 # via stevedore @@ -231,6 +230,7 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.in + # django # django-ses # djangorestframework # drf-yasg @@ -238,7 +238,7 @@ pyyaml==6.0.1 # via # code-annotations # drf-yasg -redis==5.0.1 +redis==5.0.0 # via -r requirements/base.in requests==2.31.0 # via @@ -252,7 +252,7 @@ requests-oauthlib==1.3.1 # via social-auth-core rules==3.3 # via -r requirements/base.in -s3transfer==0.7.0 +s3transfer==0.6.2 # via boto3 semantic-version==2.10.0 # via edx-drf-extensions @@ -282,7 +282,7 @@ stevedore==5.1.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # asgiref # edx-opaque-keys @@ -295,7 +295,7 @@ unicodecsv==0.14.1 # via djangorestframework-csv uritemplate==4.1.1 # via drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # botocore # requests @@ -304,7 +304,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via prompt-toolkit -zipp==3.17.0 +zipp==3.16.2 # via -r requirements/base.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index a5676767..18ff1b20 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -18,7 +18,7 @@ # using LTS django version - +Django<4.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a1a6a6a0..48753f51 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,8 +23,3 @@ wrapt==1.11.* edx-lint<5.3 pylint<2.15 astroid<2.12 - -# Stay on LTS release -# This can be removed once all IDAs have been upgraded to Django 4.2 -# and the global constraint has been updated from Django<4.0 to Django<4.3 -Django<4.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 08b1abf1..872ce2bb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -34,17 +34,16 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/validation.txt # celery - # django # kombu billiard==4.1.0 # via # -r requirements/validation.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/validation.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/validation.txt # boto3 @@ -62,12 +61,12 @@ certifi==2023.7.22 # via # -r requirements/validation.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/validation.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/validation.txt # requests @@ -105,11 +104,11 @@ code-annotations==1.5.0 # -r requirements/validation.txt # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/validation.txt # pytest-cov -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/validation.txt # pyjwt @@ -118,7 +117,7 @@ ddt==1.6.0 # via # -r requirements/dev.in # -r requirements/validation.txt -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/validation.txt # python3-openid @@ -131,9 +130,9 @@ dill==0.3.7 # via # -r requirements/validation.txt # pylint -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/validation.txt # django-celery-results # django-cors-headers @@ -174,13 +173,13 @@ django-debug-toolbar==4.2.0 # via -r requirements/dev.in django-durationwidget==1.0.5 # via -r requirements/validation.txt -django-dynamic-fixture==4.0.1 +django-dynamic-fixture==4.0.0 # via -r requirements/validation.txt django-extensions==3.2.3 # via # -r requirements/dev.in # -r requirements/validation.txt -django-filter==23.3 +django-filter==23.2 # via -r requirements/validation.txt django-log-request-id==2.1.0 # via -r requirements/validation.txt @@ -236,7 +235,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/validation.txt # edx-rbac @@ -246,7 +245,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/validation.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/validation.txt # edx-drf-extensions @@ -262,7 +261,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/validation.txt -faker==19.6.2 +faker==19.6.1 # via # -r requirements/validation.txt # factory-boy @@ -333,7 +332,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/validation.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/validation.txt # edx-django-utils @@ -342,7 +341,7 @@ oauthlib==3.2.2 # -r requirements/validation.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/pip-tools.txt # -r requirements/validation.txt @@ -362,7 +361,7 @@ pbr==5.11.1 # stevedore pip-tools==7.3.0 # via -r requirements/pip-tools.txt -platformdirs==3.11.0 +platformdirs==3.10.0 # via # -r requirements/validation.txt # pylint @@ -393,9 +392,9 @@ pycparser==2.21 # via # -r requirements/validation.txt # cffi -pydantic==2.4.2 +pydantic==2.3.0 # via inflect -pydantic-core==2.10.1 +pydantic-core==2.6.3 # via pydantic pydocstyle==6.3.0 # via -r requirements/validation.txt @@ -470,6 +469,7 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/validation.txt + # django # django-ses # djangorestframework # drf-yasg @@ -481,7 +481,7 @@ pyyaml==6.0.1 # code-annotations # drf-yasg # edx-i18n-tools -redis==5.0.1 +redis==5.0.0 # via -r requirements/validation.txt requests==2.31.0 # via @@ -498,7 +498,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/validation.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/validation.txt # boto3 @@ -564,7 +564,7 @@ tomlkit==0.12.1 # via # -r requirements/validation.txt # pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/validation.txt # annotated-types @@ -590,7 +590,7 @@ uritemplate==4.1.1 # via # -r requirements/validation.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/validation.txt # botocore @@ -601,7 +601,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/validation.txt # prompt-toolkit @@ -614,7 +614,7 @@ wrapt==1.11.2 # -c requirements/constraints.txt # -r requirements/validation.txt # astroid -zipp==3.17.0 +zipp==3.16.2 # via # -r requirements/pip-tools.txt # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index f9c4cef1..d28e42a3 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -28,7 +28,7 @@ async-timeout==4.0.3 # via # -r requirements/test.txt # redis -babel==2.13.0 +babel==2.12.1 # via # pydata-sphinx-theme # sphinx @@ -40,7 +40,6 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery - # django # kombu beautifulsoup4==4.12.2 # via pydata-sphinx-theme @@ -48,11 +47,11 @@ billiard==4.1.0 # via # -r requirements/test.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/test.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/test.txt # boto3 @@ -66,12 +65,12 @@ certifi==2023.7.22 # via # -r requirements/test.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests @@ -107,18 +106,18 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/test.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/test.txt # python3-openid @@ -127,9 +126,9 @@ dill==0.3.7 # via # -r requirements/test.txt # pylint -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/test.txt # django-celery-results # django-cors-headers @@ -166,11 +165,11 @@ django-crum==0.7.9 # edx-toggles django-durationwidget==1.0.5 # via -r requirements/test.txt -django-dynamic-fixture==4.0.1 +django-dynamic-fixture==4.0.0 # via -r requirements/test.txt django-extensions==3.2.3 # via -r requirements/test.txt -django-filter==23.3 +django-filter==23.2 # via -r requirements/test.txt django-log-request-id==2.1.0 # via -r requirements/test.txt @@ -235,7 +234,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/test.txt # edx-rbac @@ -243,7 +242,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/test.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/test.txt # edx-drf-extensions @@ -259,7 +258,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.6.2 +faker==19.6.1 # via # -r requirements/test.txt # factory-boy @@ -321,7 +320,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -332,7 +331,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/test.txt # drf-yasg @@ -343,7 +342,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.11.0 +platformdirs==3.10.0 # via # -r requirements/test.txt # pylint @@ -367,7 +366,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.14.1 +pydata-sphinx-theme==0.13.3 # via sphinx-book-theme pygments==2.16.1 # via @@ -442,6 +441,7 @@ pytz==2023.3.post1 # via # -r requirements/test.txt # babel + # django # django-ses # djangorestframework # drf-yasg @@ -452,7 +452,7 @@ pyyaml==6.0.1 # drf-yasg readme-renderer==42.0 # via -r requirements/doc.in -redis==5.0.1 +redis==5.0.0 # via -r requirements/test.txt requests==2.31.0 # via @@ -472,7 +472,7 @@ restructuredtext-lint==1.4.0 # via doc8 rules==3.3 # via -r requirements/test.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/test.txt # boto3 @@ -553,7 +553,7 @@ tomlkit==0.12.1 # via # -r requirements/test.txt # pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/test.txt # asgiref @@ -576,7 +576,7 @@ uritemplate==4.1.1 # via # -r requirements/test.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/test.txt # botocore @@ -587,7 +587,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/test.txt # prompt-toolkit @@ -596,7 +596,7 @@ wrapt==1.11.2 # -c requirements/constraints.txt # -r requirements/test.txt # astroid -zipp==3.17.0 +zipp==3.16.2 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 50d35f22..d2e8e4e5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via pip-tools importlib-metadata==6.8.0 # via build -packaging==23.2 +packaging==23.1 # via build pip-tools==7.3.0 # via -r requirements/pip-tools.in @@ -23,7 +23,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools -zipp==3.17.0 +zipp==3.16.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index ccb763a2..7aee1c71 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -26,17 +26,16 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery - # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/base.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/base.txt # boto3 @@ -50,12 +49,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -84,19 +83,19 @@ code-annotations==1.5.0 # via # -r requirements/base.txt # edx-toggles -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/base.txt # python3-openid # social-auth-core -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -135,7 +134,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.3 +django-filter==23.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -191,11 +190,11 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/base.txt # edx-rbac -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -207,7 +206,7 @@ edx-toggles==5.1.0 # via -r requirements/base.txt gevent==23.9.1 # via -r requirements/production.in -greenlet==3.0.0 +greenlet==2.0.2 # via gevent gunicorn==21.2.0 # via -r requirements/production.in @@ -246,7 +245,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -255,7 +254,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/base.txt # drf-yasg @@ -317,6 +316,7 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt + # django # django-ses # djangorestframework # drf-yasg @@ -326,7 +326,7 @@ pyyaml==6.0.1 # -r requirements/production.in # code-annotations # drf-yasg -redis==5.0.1 +redis==5.0.0 # via -r requirements/base.txt requests==2.31.0 # via @@ -343,7 +343,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/base.txt # boto3 @@ -389,7 +389,7 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref @@ -408,7 +408,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/base.txt # botocore @@ -419,15 +419,15 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit -zipp==3.17.0 +zipp==3.16.2 # via -r requirements/base.txt zope-event==5.0 # via gevent -zope-interface==6.1 +zope-interface==6.0 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 69b41aa2..e2db9ae4 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -31,17 +31,16 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery - # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/base.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/base.txt # boto3 @@ -55,12 +54,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -94,21 +93,21 @@ code-annotations==1.5.0 # -r requirements/base.txt # edx-lint # edx-toggles -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/base.txt # python3-openid # social-auth-core dill==0.3.7 # via pylint -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -147,7 +146,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.3 +django-filter==23.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -203,7 +202,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/base.txt # edx-rbac @@ -211,7 +210,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/quality.in -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -264,7 +263,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -273,7 +272,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/base.txt # drf-yasg @@ -281,7 +280,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.11.0 +platformdirs==3.10.0 # via pylint ply==3.11 # via @@ -351,6 +350,7 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt + # django # django-ses # djangorestframework # drf-yasg @@ -359,7 +359,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # code-annotations # drf-yasg -redis==5.0.1 +redis==5.0.0 # via -r requirements/base.txt requests==2.31.0 # via @@ -376,7 +376,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/base.txt # boto3 @@ -428,7 +428,7 @@ tomli==2.0.1 # via pylint tomlkit==0.12.1 # via pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref @@ -449,7 +449,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/base.txt # botocore @@ -460,7 +460,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit @@ -468,7 +468,7 @@ wrapt==1.11.2 # via # -c requirements/constraints.txt # astroid -zipp==3.17.0 +zipp==3.16.2 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 7c9feafd..b091eedd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -31,17 +31,16 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery - # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/base.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/base.txt # boto3 @@ -55,12 +54,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests @@ -95,27 +94,27 @@ code-annotations==1.5.0 # -r requirements/test.in # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/test.in # pytest-cov -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/test.in -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/base.txt # python3-openid # social-auth-core dill==0.3.7 # via pylint -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -152,11 +151,11 @@ django-crum==0.7.9 # edx-toggles django-durationwidget==1.0.5 # via -r requirements/base.txt -django-dynamic-fixture==4.0.1 +django-dynamic-fixture==4.0.0 # via -r requirements/test.in django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.3 +django-filter==23.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -212,7 +211,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/base.txt # edx-rbac @@ -220,7 +219,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/base.txt # edx-drf-extensions @@ -234,7 +233,7 @@ exceptiongroup==1.1.3 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==19.6.2 +faker==19.6.1 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -281,7 +280,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -290,7 +289,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/base.txt # drf-yasg @@ -299,7 +298,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.11.0 +platformdirs==3.10.0 # via pylint pluggy==1.3.0 # via pytest @@ -377,6 +376,7 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt + # django # django-ses # djangorestframework # drf-yasg @@ -385,7 +385,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # code-annotations # drf-yasg -redis==5.0.1 +redis==5.0.0 # via -r requirements/base.txt requests==2.31.0 # via @@ -402,7 +402,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/base.txt # boto3 @@ -455,7 +455,7 @@ tomli==2.0.1 # pytest tomlkit==0.12.1 # via pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref @@ -477,7 +477,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/base.txt # botocore @@ -488,7 +488,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit @@ -496,7 +496,7 @@ wrapt==1.11.2 # via # -c requirements/constraints.txt # astroid -zipp==3.17.0 +zipp==3.16.2 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/validation.txt b/requirements/validation.txt index 6ab38dda..e5f05fa6 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -40,19 +40,18 @@ backports-zoneinfo[tzdata]==0.2.1 # -r requirements/quality.txt # -r requirements/test.txt # celery - # django # kombu billiard==4.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt # celery -boto3==1.28.60 +boto3==1.28.48 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.31.60 +botocore==1.31.48 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -69,13 +68,13 @@ certifi==2023.7.22 # -r requirements/quality.txt # -r requirements/test.txt # requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/quality.txt # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.3.0 +charset-normalizer==3.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -118,11 +117,11 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.4 +cryptography==41.0.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -130,7 +129,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -141,9 +140,9 @@ dill==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # pylint -django==4.2.6 +django==3.2.21 # via - # -c requirements/constraints.txt + # -c requirements/common_constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # django-celery-results @@ -189,13 +188,13 @@ django-durationwidget==1.0.5 # via # -r requirements/quality.txt # -r requirements/test.txt -django-dynamic-fixture==4.0.1 +django-dynamic-fixture==4.0.0 # via -r requirements/test.txt django-extensions==3.2.3 # via # -r requirements/quality.txt # -r requirements/test.txt -django-filter==23.3 +django-filter==23.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -279,7 +278,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.10.0 +edx-drf-extensions==8.9.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -291,7 +290,7 @@ edx-lint==5.2.5 # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.5.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -314,7 +313,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.6.2 +faker==19.6.1 # via # -r requirements/test.txt # factory-boy @@ -384,7 +383,7 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==9.1.0 +newrelic==9.0.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -395,7 +394,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.2 +packaging==23.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -410,7 +409,7 @@ pbr==5.11.1 # -r requirements/quality.txt # -r requirements/test.txt # stevedore -platformdirs==3.11.0 +platformdirs==3.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -521,6 +520,7 @@ pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt + # django # django-ses # djangorestframework # drf-yasg @@ -531,7 +531,7 @@ pyyaml==6.0.1 # code-annotations # drf-yasg # edx-i18n-tools -redis==5.0.1 +redis==5.0.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -554,7 +554,7 @@ rules==3.3 # via # -r requirements/quality.txt # -r requirements/test.txt -s3transfer==0.7.0 +s3transfer==0.6.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -628,7 +628,7 @@ tomlkit==0.12.1 # -r requirements/quality.txt # -r requirements/test.txt # pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -654,7 +654,7 @@ uritemplate==4.1.1 # -r requirements/quality.txt # -r requirements/test.txt # drf-yasg -urllib3==1.26.17 +urllib3==1.26.16 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -667,7 +667,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.8 +wcwidth==0.2.6 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -678,7 +678,7 @@ wrapt==1.11.2 # -r requirements/quality.txt # -r requirements/test.txt # astroid -zipp==3.17.0 +zipp==3.16.2 # via # -r requirements/quality.txt # -r requirements/test.txt