From e3fac517bba428db808b461b790c644735aed0b7 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 28 Sep 2023 17:25:49 +0500 Subject: [PATCH 1/5] feat!: Upgrade to Django 4.2 --- .github/workflows/ci.yml | 4 +- Makefile | 10 ++++- requirements/base.txt | 27 ++++++------ requirements/ci.txt | 8 ++-- requirements/common_constraints.txt | 28 ++++++++++++ requirements/constraints.txt | 5 ++- requirements/dev.txt | 66 +++++++++++++---------------- requirements/doc.txt | 62 ++++++++++++--------------- requirements/pip-tools.txt | 4 +- requirements/pip.txt | 2 +- requirements/production.txt | 24 +++++------ requirements/quality.txt | 60 ++++++++++++-------------- requirements/test.txt | 43 +++++++++---------- requirements/validation.txt | 62 ++++++++++++--------------- tox.ini | 4 +- 15 files changed, 204 insertions(+), 205 deletions(-) create mode 100644 requirements/common_constraints.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bb652f5..1991a445 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django32, django40, django42, quality, docs, pii_check] + toxenv: [django42, quality, docs, pii_check] steps: - uses: actions/checkout@v2 @@ -38,7 +38,7 @@ jobs: run: tox - name: Run coverage - if: matrix.python-version == '3.8' && matrix.toxenv == 'django32' + if: matrix.python-version == '3.8' && matrix.toxenv == 'django42' uses: codecov/codecov-action@v1 with: flags: unittests diff --git a/Makefile b/Makefile index 7c0f5450..333142df 100644 --- a/Makefile +++ b/Makefile @@ -93,8 +93,16 @@ migrate: ## apply database migrations html_coverage: ## generate and view HTML coverage report coverage html && open htmlcov/index.html +COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt +.PHONY: $(COMMON_CONSTRAINTS_TXT) +$(COMMON_CONSTRAINTS_TXT): + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@) + upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in + sed 's/Django<4.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 --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/requirements/base.txt b/requirements/base.txt index 5f3ee8da..2b27662d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,6 +13,7 @@ async-timeout==4.0.3 backports-zoneinfo[tzdata]==0.2.1 # via # celery + # django # kombu billiard==4.1.0 # via celery @@ -45,17 +46,17 @@ coreapi==2.3.3 # openapi-codec coreschema==0.0.4 # via coreapi -cryptography==41.0.3 +cryptography==41.0.4 # via # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # python3-openid # social-auth-core -django==3.2.21 +django==4.2.5 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.in # django-cors-headers # django-crum @@ -99,9 +100,9 @@ edx-django-utils==5.7.0 # -r requirements/base.in # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/base.in -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via edx-drf-extensions edx-rest-api-client==5.6.0 # via -r requirements/base.in @@ -117,7 +118,7 @@ markupsafe==2.1.3 # via jinja2 mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==9.0.0 +newrelic==9.1.0 # via edx-django-utils oauthlib==3.2.2 # via @@ -147,15 +148,12 @@ pymongo==3.13.0 pynacl==1.5.0 # via edx-django-utils python-dateutil==2.8.2 - # via - # celery - # edx-drf-extensions + # via celery python3-openid==3.2.0 # via social-auth-core pytz==2023.3.post1 # via # -r requirements/base.in - # django # djangorestframework pyyaml==6.0.1 # via edx-django-release-util @@ -180,7 +178,6 @@ six==1.16.0 # via # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # python-dateutil slumber==0.7.1 # via edx-rest-api-client @@ -196,9 +193,9 @@ stevedore==5.1.0 # via # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/base.in -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # asgiref # edx-opaque-keys @@ -210,7 +207,7 @@ tzdata==2023.3 # celery uritemplate==4.1.1 # via coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via requests vine==5.0.0 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index 8fd9ada1..09f92b40 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,7 +6,7 @@ # distlib==0.3.7 # via virtualenv -filelock==3.12.3 +filelock==3.12.4 # via # tox # virtualenv @@ -24,12 +24,10 @@ tomli==2.0.1 # via tox tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/ci.in # tox-battery tox-battery==0.6.2 # via -r requirements/ci.in -typing-extensions==4.7.1 - # via filelock -virtualenv==20.24.4 +virtualenv==20.24.5 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 00000000..e2365826 --- /dev/null +++ b/requirements/common_constraints.txt @@ -0,0 +1,28 @@ + +# A central location for most common version constraints +# (across edx repos) for pip-installation. +# +# Similar to other constraint files this file doesn't install any packages. +# It specifies version constraints that will be applied if a package is needed. +# When pinning something here, please provide an explanation of why it is a good +# idea to pin this package across all edx repos, Ideally, link to other information +# that will help people in the future to remove the pin when possible. +# Writing an issue against the offending project and linking to it here is good. +# +# Note: Changes to this file will automatically be used by other repos, referencing +# this file from Github directly. It does not require packaging in edx-lint. + + +# using LTS django version + + +# 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 +elasticsearch<7.14.0 + +# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected +django-simple-history==3.0.0 + +# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. +# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 +tox<4.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d91704bb..52b10296 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,4 +9,7 @@ # linking to it here is good. # Common constraints for edx repos --c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt +-c common_constraints.txt + +# This constraint can be removed once global Django constraint has been updated +Django<4.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index b79502c1..faaf8a96 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/validation.txt # django -astroid==2.15.6 +astroid==2.15.8 # via # -r requirements/validation.txt # pylint @@ -25,16 +25,13 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/validation.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/validation.txt # celery -bleach==6.0.0 - # via - # -r requirements/validation.txt - # readme-renderer -build==1.0.0 +build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools @@ -97,18 +94,18 @@ coreschema==0.0.4 # via # -r requirements/validation.txt # coreapi -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/validation.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/validation.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/validation.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/validation.txt # python3-openid @@ -123,7 +120,7 @@ distlib==0.3.7 # via # -r requirements/validation.txt # virtualenv -django==3.2.21 +django==4.2.5 # via # -r requirements/validation.txt # django-cors-headers @@ -150,7 +147,7 @@ django-debug-toolbar==4.2.0 # via # -r requirements/dev.in # -r requirements/validation.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/validation.txt django-extensions==3.2.3 # via -r requirements/validation.txt @@ -184,13 +181,13 @@ edx-django-utils==5.7.0 # -r requirements/validation.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/validation.txt -edx-i18n-tools==1.1.0 +edx-i18n-tools==1.2.0 # via -r requirements/dev.in edx-lint==5.3.4 # via -r requirements/validation.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/validation.txt # edx-drf-extensions @@ -200,7 +197,7 @@ exceptiongroup==1.1.3 # via # -r requirements/validation.txt # pytest -filelock==3.12.3 +filelock==3.12.4 # via # -r requirements/validation.txt # tox @@ -216,7 +213,7 @@ importlib-metadata==6.8.0 # build # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.1.0 # via # -r requirements/validation.txt # keyring @@ -278,10 +275,14 @@ more-itertools==10.1.0 # jaraco-classes mysqlclient==2.2.0 # via -r requirements/validation.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/validation.txt # edx-django-utils +nh3==0.2.14 + # via + # -r requirements/validation.txt + # readme-renderer oauthlib==3.2.2 # via # -r requirements/validation.txt @@ -359,7 +360,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.17.5 +pylint==2.17.6 # via # -r requirements/validation.txt # edx-lint @@ -391,7 +392,7 @@ pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt # build -pytest==7.4.1 +pytest==7.4.2 # via # -r requirements/validation.txt # pytest-cov @@ -404,7 +405,6 @@ python-dateutil==2.8.2 # via # -r requirements/validation.txt # celery - # edx-drf-extensions python-slugify==8.0.1 # via # -r requirements/validation.txt @@ -416,7 +416,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/validation.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -425,7 +424,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # responses -readme-renderer==41.0 +readme-renderer==42.0 # via # -r requirements/validation.txt # twine @@ -460,7 +459,7 @@ rfc3986==2.0.0 # via # -r requirements/validation.txt # twine -rich==13.5.2 +rich==13.5.3 # via # -r requirements/validation.txt # twine @@ -475,10 +474,8 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/validation.txt - # bleach # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # edx-lint # python-dateutil # tox @@ -510,9 +507,9 @@ stevedore==5.1.0 # code-annotations # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/validation.txt -testfixtures==7.1.0 +testfixtures==7.2.0 # via -r requirements/validation.txt text-unidecode==1.3 # via @@ -537,17 +534,16 @@ tox==3.28.0 # via -r requirements/validation.txt twine==4.0.2 # via -r requirements/validation.txt -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via # -r requirements/validation.txt # responses -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/validation.txt # asgiref # astroid # edx-opaque-keys - # filelock # kombu # pylint # rich @@ -561,7 +557,7 @@ uritemplate==4.1.1 # via # -r requirements/validation.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/validation.txt # requests @@ -573,7 +569,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.4 +virtualenv==20.24.5 # via # -r requirements/validation.txt # tox @@ -581,10 +577,6 @@ wcwidth==0.2.6 # via # -r requirements/validation.txt # prompt-toolkit -webencodings==0.5.1 - # via - # -r requirements/validation.txt - # bleach wheel==0.41.2 # via # -r requirements/pip-tools.txt @@ -593,7 +585,7 @@ wrapt==1.15.0 # via # -r requirements/validation.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/pip-tools.txt # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 69111df6..38011438 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.6 +astroid==2.15.8 # via # -r requirements/test.txt # pylint @@ -29,14 +29,13 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/test.txt # celery -bleach==6.0.0 - # via readme-renderer -build==1.0.0 +build==1.0.3 # via -r requirements/doc.in celery[redis]==5.3.4 # via -r requirements/test.txt @@ -93,18 +92,18 @@ coreschema==0.0.4 # via # -r requirements/test.txt # coreapi -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/test.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/test.txt # python3-openid @@ -117,9 +116,9 @@ distlib==0.3.7 # via # -r requirements/test.txt # virtualenv -django==3.2.21 +django==4.2.5 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/test.txt # django-cors-headers # django-crum @@ -139,7 +138,7 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.txt django-extensions==3.2.3 # via -r requirements/test.txt @@ -177,11 +176,11 @@ edx-django-utils==5.7.0 # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions @@ -193,7 +192,7 @@ exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest -filelock==3.12.3 +filelock==3.12.4 # via # -r requirements/test.txt # tox @@ -210,7 +209,7 @@ importlib-metadata==6.8.0 # keyring # sphinx # twine -importlib-resources==6.0.1 +importlib-resources==6.1.0 # via keyring iniconfig==2.0.0 # via @@ -260,10 +259,12 @@ more-itertools==10.1.0 # via jaraco-classes mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.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 @@ -328,7 +329,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.17.5 +pylint==2.17.6 # via # -r requirements/test.txt # edx-lint @@ -358,7 +359,7 @@ pynacl==1.5.0 # edx-django-utils pyproject-hooks==1.0.0 # via build -pytest==7.4.1 +pytest==7.4.2 # via # -r requirements/test.txt # pytest-cov @@ -371,7 +372,6 @@ python-dateutil==2.8.2 # via # -r requirements/test.txt # celery - # edx-drf-extensions python-slugify==8.0.1 # via # -r requirements/test.txt @@ -384,7 +384,6 @@ pytz==2023.3.post1 # via # -r requirements/test.txt # babel - # django # djangorestframework pyyaml==6.0.1 # via @@ -392,7 +391,7 @@ pyyaml==6.0.1 # code-annotations # edx-django-release-util # responses -readme-renderer==41.0 +readme-renderer==42.0 # via twine redis==4.6.0 # via @@ -424,7 +423,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.5.2 +rich==13.5.3 # via twine semantic-version==2.10.0 # via @@ -437,10 +436,8 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/test.txt - # bleach # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # edx-lint # edx-sphinx-theme # python-dateutil @@ -487,9 +484,9 @@ stevedore==5.1.0 # doc8 # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/test.txt -testfixtures==7.1.0 +testfixtures==7.2.0 # via -r requirements/test.txt text-unidecode==1.3 # via @@ -511,21 +508,20 @@ tomlkit==0.12.1 # pylint tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/test.txt twine==4.0.2 # via -r requirements/doc.in -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via # -r requirements/test.txt # responses -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref # astroid # edx-opaque-keys - # filelock # kombu # pylint # rich @@ -539,7 +535,7 @@ uritemplate==4.1.1 # via # -r requirements/test.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/test.txt # requests @@ -551,7 +547,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.4 +virtualenv==20.24.5 # via # -r requirements/test.txt # tox @@ -559,13 +555,11 @@ wcwidth==0.2.6 # via # -r requirements/test.txt # prompt-toolkit -webencodings==0.5.1 - # via bleach wrapt==1.15.0 # via # -r requirements/test.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 135c9d9a..894fa179 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.0.0 +build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools @@ -23,7 +23,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools -zipp==3.16.2 +zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 13c7e845..3e7d8f4a 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.2 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index b9ffaba7..6a613d7b 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -20,6 +20,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery + # django # kombu billiard==4.1.0 # via @@ -69,17 +70,17 @@ coreschema==0.0.4 # via # -r requirements/base.txt # coreapi -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.21 +django==4.2.5 # via # -r requirements/base.txt # django-cors-headers @@ -128,15 +129,15 @@ edx-django-utils==5.7.0 # -r requirements/base.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/base.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions edx-rest-api-client==5.6.0 # via -r requirements/base.txt -gevent==23.9.0.post1 +gevent==23.9.1 # via -r requirements/production.in greenlet==2.0.2 # via gevent @@ -166,7 +167,7 @@ mysqlclient==2.2.0 # via # -r requirements/base.txt # -r requirements/production.in -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -221,7 +222,6 @@ python-dateutil==2.8.2 # via # -r requirements/base.txt # celery - # edx-drf-extensions python3-openid==3.2.0 # via # -r requirements/base.txt @@ -229,7 +229,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -267,7 +266,6 @@ six==1.16.0 # -r requirements/base.txt # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # python-dateutil slumber==0.7.1 # via @@ -291,9 +289,9 @@ stevedore==5.1.0 # -r requirements/base.txt # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/base.txt -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref @@ -309,7 +307,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/base.txt # requests diff --git a/requirements/quality.txt b/requirements/quality.txt index 79e56bbb..d2aa47ef 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.6 +astroid==2.15.8 # via # -r requirements/test.txt # pylint @@ -25,13 +25,12 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/test.txt # celery -bleach==6.0.0 - # via readme-renderer celery[redis]==5.3.4 # via -r requirements/test.txt certifi==2023.7.22 @@ -87,18 +86,18 @@ coreschema==0.0.4 # via # -r requirements/test.txt # coreapi -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/test.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/test.txt # python3-openid @@ -111,9 +110,9 @@ distlib==0.3.7 # via # -r requirements/test.txt # virtualenv -django==3.2.21 +django==4.2.5 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/test.txt # django-cors-headers # django-crum @@ -136,7 +135,7 @@ django-crum==0.7.9 # edx-django-utils django-debug-toolbar==4.2.0 # via -r requirements/quality.in -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.txt django-extensions==3.2.3 # via -r requirements/test.txt @@ -168,13 +167,13 @@ edx-django-utils==5.7.0 # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/test.txt edx-lint==5.3.4 # via # -r requirements/quality.in # -r requirements/test.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions @@ -184,7 +183,7 @@ exceptiongroup==1.1.3 # via # -r requirements/test.txt # pytest -filelock==3.12.3 +filelock==3.12.4 # via # -r requirements/test.txt # tox @@ -197,7 +196,7 @@ importlib-metadata==6.8.0 # via # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.1.0 # via keyring iniconfig==2.0.0 # via @@ -247,10 +246,12 @@ more-itertools==10.1.0 # via jaraco-classes mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.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 @@ -315,7 +316,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.17.5 +pylint==2.17.6 # via # -r requirements/test.txt # edx-lint @@ -343,7 +344,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.4.1 +pytest==7.4.2 # via # -r requirements/test.txt # pytest-cov @@ -356,7 +357,6 @@ python-dateutil==2.8.2 # via # -r requirements/test.txt # celery - # edx-drf-extensions python-slugify==8.0.1 # via # -r requirements/test.txt @@ -368,7 +368,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/test.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -376,7 +375,7 @@ pyyaml==6.0.1 # code-annotations # edx-django-release-util # responses -readme-renderer==41.0 +readme-renderer==42.0 # via twine redis==4.6.0 # via @@ -405,7 +404,7 @@ responses==0.23.3 # via -r requirements/test.txt rfc3986==2.0.0 # via twine -rich==13.5.2 +rich==13.5.3 # via twine semantic-version==2.10.0 # via @@ -418,10 +417,8 @@ simplejson==3.19.1 six==1.16.0 # via # -r requirements/test.txt - # bleach # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # edx-lint # python-dateutil # tox @@ -451,9 +448,9 @@ stevedore==5.1.0 # code-annotations # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/test.txt -testfixtures==7.1.0 +testfixtures==7.2.0 # via -r requirements/test.txt text-unidecode==1.3 # via @@ -472,21 +469,20 @@ tomlkit==0.12.1 # pylint tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/test.txt twine==4.0.2 # via -r requirements/quality.in -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via # -r requirements/test.txt # responses -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref # astroid # edx-opaque-keys - # filelock # kombu # pylint # rich @@ -500,7 +496,7 @@ uritemplate==4.1.1 # via # -r requirements/test.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/test.txt # requests @@ -512,7 +508,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.4 +virtualenv==20.24.5 # via # -r requirements/test.txt # tox @@ -520,13 +516,11 @@ wcwidth==0.2.6 # via # -r requirements/test.txt # prompt-toolkit -webencodings==0.5.1 - # via bleach wrapt==1.15.0 # via # -r requirements/test.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/test.txt b/requirements/test.txt index 78413b7a..5310c1c2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -astroid==2.15.6 +astroid==2.15.8 # via # pylint # pylint-celery @@ -24,6 +24,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery + # django # kombu billiard==4.1.0 # via @@ -82,18 +83,18 @@ coreschema==0.0.4 # via # -r requirements/base.txt # coreapi -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/test.in # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt # social-auth-core ddt==1.6.0 # via -r requirements/test.in -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/base.txt # python3-openid @@ -103,7 +104,7 @@ dill==0.3.7 distlib==0.3.7 # via virtualenv # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-cors-headers # django-crum @@ -123,7 +124,7 @@ django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.in django-extensions==3.2.3 # via -r requirements/base.txt @@ -153,11 +154,11 @@ edx-django-utils==5.7.0 # -r requirements/base.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via -r requirements/base.txt edx-lint==5.3.4 # via -r requirements/test.in -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -165,7 +166,7 @@ edx-rest-api-client==5.6.0 # via -r requirements/base.txt exceptiongroup==1.1.3 # via pytest -filelock==3.12.3 +filelock==3.12.4 # via # tox # virtualenv @@ -202,7 +203,7 @@ mock==5.1.0 # via -r requirements/test.in mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -255,7 +256,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.17.5 +pylint==2.17.6 # via # edx-lint # pylint-celery @@ -277,7 +278,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.4.1 +pytest==7.4.2 # via # pytest-cov # pytest-django @@ -289,7 +290,6 @@ python-dateutil==2.8.2 # via # -r requirements/base.txt # celery - # edx-drf-extensions python-slugify==8.0.1 # via code-annotations python3-openid==3.2.0 @@ -299,7 +299,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -341,7 +340,6 @@ six==1.16.0 # -r requirements/base.txt # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # edx-lint # python-dateutil # tox @@ -368,9 +366,9 @@ stevedore==5.1.0 # code-annotations # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via -r requirements/base.txt -testfixtures==7.1.0 +testfixtures==7.2.0 # via -r requirements/test.in text-unidecode==1.3 # via python-slugify @@ -384,17 +382,16 @@ tomlkit==0.12.1 # via pylint tox==3.28.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -c requirements/common_constraints.txt # -r requirements/test.in -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via responses -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref # astroid # edx-opaque-keys - # filelock # kombu # pylint # stripe @@ -407,7 +404,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/base.txt # requests @@ -418,7 +415,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.4 +virtualenv==20.24.5 # via tox wcwidth==0.2.6 # via diff --git a/requirements/validation.txt b/requirements/validation.txt index 3c577950..b022f553 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -14,7 +14,7 @@ asgiref==3.7.2 # -r requirements/quality.txt # -r requirements/test.txt # django -astroid==2.15.6 +astroid==2.15.8 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -30,16 +30,13 @@ 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 -bleach==6.0.0 - # via - # -r requirements/quality.txt - # readme-renderer celery[redis]==5.3.4 # via # -r requirements/quality.txt @@ -108,12 +105,12 @@ coreschema==0.0.4 # -r requirements/quality.txt # -r requirements/test.txt # coreapi -coverage[toml]==7.3.0 +coverage[toml]==7.3.1 # via # -r requirements/quality.txt # -r requirements/test.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -123,7 +120,7 @@ ddt==1.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -139,7 +136,7 @@ distlib==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # virtualenv -django==3.2.21 +django==4.2.5 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -167,7 +164,7 @@ django-crum==0.7.9 # edx-django-utils django-debug-toolbar==4.2.0 # via -r requirements/quality.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -215,7 +212,7 @@ edx-django-utils==5.7.0 # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==8.9.2 +edx-drf-extensions==8.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -223,7 +220,7 @@ edx-lint==5.3.4 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -237,7 +234,7 @@ exceptiongroup==1.1.3 # -r requirements/quality.txt # -r requirements/test.txt # pytest -filelock==3.12.3 +filelock==3.12.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -253,7 +250,7 @@ importlib-metadata==6.8.0 # -r requirements/quality.txt # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.1.0 # via # -r requirements/quality.txt # keyring @@ -326,11 +323,15 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils +nh3==0.2.14 + # via + # -r requirements/quality.txt + # readme-renderer oauthlib==3.2.2 # via # -r requirements/quality.txt @@ -411,7 +412,7 @@ pyjwt[crypto]==2.8.0 # edx-drf-extensions # edx-rest-api-client # social-auth-core -pylint==2.17.5 +pylint==2.17.6 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -445,7 +446,7 @@ pynacl==1.5.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-django-utils -pytest==7.4.1 +pytest==7.4.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -464,7 +465,6 @@ python-dateutil==2.8.2 # -r requirements/quality.txt # -r requirements/test.txt # celery - # edx-drf-extensions python-slugify==8.0.1 # via # -r requirements/quality.txt @@ -479,7 +479,6 @@ pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt - # django # djangorestframework pyyaml==6.0.1 # via @@ -488,7 +487,7 @@ pyyaml==6.0.1 # code-annotations # edx-django-release-util # responses -readme-renderer==41.0 +readme-renderer==42.0 # via # -r requirements/quality.txt # twine @@ -528,7 +527,7 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==13.5.2 +rich==13.5.3 # via # -r requirements/quality.txt # twine @@ -546,10 +545,8 @@ six==1.16.0 # via # -r requirements/quality.txt # -r requirements/test.txt - # bleach # edx-auth-backends # edx-django-release-util - # edx-drf-extensions # edx-lint # python-dateutil # tox @@ -586,11 +583,11 @@ stevedore==5.1.0 # code-annotations # edx-django-utils # edx-opaque-keys -stripe==6.2.0 +stripe==6.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt -testfixtures==7.1.0 +testfixtures==7.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -618,19 +615,18 @@ tox==3.28.0 # -r requirements/test.txt twine==4.0.2 # via -r requirements/quality.txt -types-pyyaml==6.0.12.11 +types-pyyaml==6.0.12.12 # via # -r requirements/quality.txt # -r requirements/test.txt # responses -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/quality.txt # -r requirements/test.txt # asgiref # astroid # edx-opaque-keys - # filelock # kombu # pylint # rich @@ -646,7 +642,7 @@ uritemplate==4.1.1 # -r requirements/quality.txt # -r requirements/test.txt # coreapi -urllib3==2.0.4 +urllib3==2.0.5 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -660,7 +656,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.4 +virtualenv==20.24.5 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -670,16 +666,12 @@ wcwidth==0.2.6 # -r requirements/quality.txt # -r requirements/test.txt # prompt-toolkit -webencodings==0.5.1 - # via - # -r requirements/quality.txt - # bleach wrapt==1.15.0 # via # -r requirements/quality.txt # -r requirements/test.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/quality.txt # importlib-metadata diff --git a/tox.ini b/tox.ini index ca5676c3..10fa3d83 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40,42}, quality, docs, pii_check +envlist = py38-django{42}, quality, docs, pii_check skipsdist = true [doc8] @@ -37,8 +37,6 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt commands = From 4902e4feb9416be52f26255b4fa00979fc6c6c34 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 28 Sep 2023 17:34:56 +0500 Subject: [PATCH 2/5] fix: add deprecated_pytz setting --- commerce_coordinator/settings/base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/commerce_coordinator/settings/base.py b/commerce_coordinator/settings/base.py index afd425df..83d6e12d 100644 --- a/commerce_coordinator/settings/base.py +++ b/commerce_coordinator/settings/base.py @@ -324,3 +324,6 @@ def root(*x): ] } } + +# disable indexing on history_date +USE_DEPRECATED_PYTZ = True From a67feb0abe41ac75b963347a6eed1ba7da27bf0d Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 28 Sep 2023 18:10:56 +0500 Subject: [PATCH 3/5] fix: fix django versions --- requirements/django.txt | 2 +- setup.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements/django.txt b/requirements/django.txt index 0e0a4523..c7734200 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.19 +django==4.2.5 diff --git a/setup.py b/setup.py index 816e2662..15a1ec50 100755 --- a/setup.py +++ b/setup.py @@ -123,8 +123,7 @@ def is_requirement(line): classifiers=[ 'Development Status :: 3 - Alpha', 'Framework :: Django', - 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Natural Language :: English', From 6af4cbf56580456959c7559cc7b8cc3c2976cad1 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 28 Sep 2023 18:17:01 +0500 Subject: [PATCH 4/5] fix: remove django lower constraint --- requirements/base.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.in b/requirements/base.in index 57960a90..d9768a09 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -3,7 +3,7 @@ celery celery[redis] -Django>=2.2 # Web application framework +Django django-cors-headers django-extensions django-rest-swagger From baa064ca28dc665ef90f99d1cbc565ce29129f30 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 28 Sep 2023 18:38:10 +0500 Subject: [PATCH 5/5] refactor: update desc --- commerce_coordinator/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commerce_coordinator/settings/base.py b/commerce_coordinator/settings/base.py index 83d6e12d..2f020f59 100644 --- a/commerce_coordinator/settings/base.py +++ b/commerce_coordinator/settings/base.py @@ -325,5 +325,5 @@ def root(*x): } } -# disable indexing on history_date +# Setting to keep using deperecated pytz with Django>4 USE_DEPRECATED_PYTZ = True