From d3f38147b20a10a7ec8cc00da4114cf6a7df2a94 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 5 Oct 2023 19:02:44 +0500 Subject: [PATCH] feat!: upgrade to Django 4.2 LTS --- .github/workflows/ci.yml | 9 +- .travis/docker-compose-travis.yml | 11 --- Makefile | 15 +++- requirements/base.txt | 92 +++++++------------ requirements/common_constraints.txt | 0 requirements/constraints.txt | 5 +- requirements/django.txt | 2 +- requirements/pip-tools.txt | 19 ++-- requirements/pip.txt | 6 +- requirements/test.txt | 135 ++++++++++------------------ requirements/travis.txt | 28 ++---- tox.ini | 3 +- 12 files changed, 125 insertions(+), 200 deletions(-) create mode 100644 requirements/common_constraints.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39c68ddc..fd2212b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,8 @@ jobs: max-parallel: 4 matrix: python-version: ['py38'] - django-version: ['django32', 'django42'] - db-version: ['mysql57', 'mysql80'] - # excluding mysql5.7 with Django 4.2 since Django 4.2 has - # dropped support for MySQL<8 - exclude: - - django-version: 'django42' - db-version: 'mysql57' + django-version: ['django42'] + db-version: ['mysql80'] steps: - uses: actions/checkout@v2 diff --git a/.travis/docker-compose-travis.yml b/.travis/docker-compose-travis.yml index 26eb6c5c..2a043599 100644 --- a/.travis/docker-compose-travis.yml +++ b/.travis/docker-compose-travis.yml @@ -1,16 +1,6 @@ version: "2" services: - mysql57: - image: mysql:5.7 - container_name: mysql57 - command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci - environment: - MYSQL_ROOT_PASSWORD: "" - MYSQL_ALLOW_EMPTY_PASSWORD: "yes" - MYSQL_USER: "notes001" - MYSQL_PASSWORD: "secret" - MYSQL_DATABASE: "edx_notes_api" mysql80: image: mysql:8.0 container_name: mysql80 @@ -49,7 +39,6 @@ services: - ..:/edx/app/edx_notes_api/edx_notes_api command: tail -f /dev/null depends_on: - - "mysql57" - "mysql80" - "es" environment: diff --git a/Makefile b/Makefile index cd8500d9..0b5404df 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,21 @@ develop: requirements test.requirements piptools: ## install pinned version of pip-compile and pip-sync pip install -r requirements/pip-tools.txt +define COMMON_CONSTRAINTS_TEMP_COMMENT +# This is a temporary solution to override the real common_constraints.txt\n# In edx-lint, until the pyjwt constraint in edx-lint has been removed.\n# See BOM-2721 for more details.\n# Below is the copied and edited version of common_constraints\n +endef +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 + # 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 # Make sure to compile files after any other files they include! pip-compile --upgrade -o requirements/travis.txt requirements/travis.in pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in @@ -77,4 +90,4 @@ upgrade: piptools ## update the requirements/*.txt files with the latest package pip-compile --upgrade -o requirements/test.txt requirements/test.in # Let tox control the Django version for tests grep -e "^django==" requirements/base.txt > requirements/django.txt - sed -i '/^[dD]jango==/d' requirements/test.txt + sed -i.'' '/^[dD]jango==/d' requirements/test.txt diff --git a/requirements/base.txt b/requirements/base.txt index 7c7a93aa..68a088db 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,46 +4,41 @@ # # make upgrade # -asgiref==3.6.0 +asgiref==3.7.2 # via django -certifi==2022.12.7 +certifi==2023.7.22 # via # elasticsearch # requests -cffi==1.15.1 +cffi==1.16.0 # via # cryptography # pynacl chardet==3.0.4 # via requests -click==8.1.3 +click==8.1.7 # via edx-django-utils -coreapi==2.3.3 - # via drf-yasg -coreschema==0.0.4 - # via - # coreapi - # drf-yasg -cryptography==40.0.1 +cryptography==41.0.4 # via pyjwt -django==3.2.20 +django==3.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # django-cors-headers # django-crum # django-nine + # django-waffle # djangorestframework # drf-jwt # drf-yasg # edx-django-release-util # edx-django-utils # edx-drf-extensions -django-cors-headers==3.14.0 +django-cors-headers==4.2.0 # via -r requirements/base.in django-crum==0.7.9 # via edx-django-utils -django-elasticsearch-dsl==7.3 +django-elasticsearch-dsl==7.4 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -52,7 +47,7 @@ django-elasticsearch-dsl-drf==0.22.5 # via -r requirements/base.in django-nine==0.2.7 # via django-elasticsearch-dsl-drf -django-waffle==3.0.0 +django-waffle==4.0.0 # via # edx-django-utils # edx-drf-extensions @@ -65,17 +60,17 @@ djangorestframework==3.14.0 # edx-drf-extensions drf-jwt==1.19.2 # via edx-drf-extensions -drf-yasg==1.21.5 +drf-yasg==1.21.7 # via -r requirements/base.in -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.in -edx-django-utils==5.3.0 +edx-django-utils==5.7.0 # via # -r requirements/base.in # edx-drf-extensions -edx-drf-extensions==8.4.1 +edx-drf-extensions==8.10.0 # via -r requirements/base.in -edx-opaque-keys==2.3.0 +edx-opaque-keys==2.5.1 # via edx-drf-extensions elasticsearch==7.13.4 # via @@ -90,46 +85,35 @@ elasticsearch-dsl==7.4.1 # -r requirements/base.in # django-elasticsearch-dsl # django-elasticsearch-dsl-drf -future==0.18.3 - # via pyjwkest -gunicorn==20.1.0 +gunicorn==21.2.0 # via -r requirements/base.in idna==2.10 # via requests inflection==0.5.1 # via drf-yasg -itypes==1.2.0 - # via coreapi -jinja2==3.1.2 - # via coreschema -markupsafe==2.1.2 - # via jinja2 -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/base.in newrelic==4.8.0.110 # via # -c requirements/constraints.txt # -r requirements/base.in # edx-django-utils -packaging==23.0 +packaging==23.2 # via # django-nine # drf-yasg + # gunicorn path-py==9.1 # via # -c requirements/constraints.txt # -r requirements/base.in pbr==5.11.1 # via stevedore -psutil==5.9.4 +psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi -pycryptodomex==3.17 - # via pyjwkest -pyjwkest==1.4.2 - # via edx-drf-extensions -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.in # drf-jwt @@ -142,26 +126,21 @@ python-dateutil==2.4.0 # via # -c requirements/constraints.txt # -r requirements/base.in - # edx-drf-extensions # elasticsearch-dsl -pytz==2023.3 +pytz==2023.3.post1 # via # django # djangorestframework # drf-yasg -pyyaml==6.0 - # via edx-django-release-util +pyyaml==6.0.1 + # via + # drf-yasg + # edx-django-release-util requests==2.25.0 # via # -c requirements/constraints.txt # -r requirements/base.in - # coreapi # edx-drf-extensions - # pyjwkest -ruamel-yaml==0.17.21 - # via drf-yasg -ruamel-yaml-clib==0.2.7 - # via ruamel-yaml semantic-version==2.10.0 # via edx-drf-extensions six==1.16.0 @@ -169,24 +148,21 @@ six==1.16.0 # django-elasticsearch-dsl # django-elasticsearch-dsl-drf # edx-django-release-util - # edx-drf-extensions # elasticsearch-dsl - # pyjwkest # python-dateutil -sqlparse==0.4.3 +sqlparse==0.4.4 # via django -stevedore==5.0.0 +stevedore==5.1.0 # via # edx-django-utils # edx-opaque-keys -uritemplate==4.1.1 +typing-extensions==4.8.0 # via - # coreapi - # drf-yasg -urllib3==1.26.15 + # asgiref + # edx-opaque-keys +uritemplate==4.1.1 + # via drf-yasg +urllib3==1.26.17 # via # elasticsearch # requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 00000000..e69de29b diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 74c0a461..d6d0ba7a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,4 +1,4 @@ -# Version constraints for pip installation. +# Version constraints for pip-installation. # # This file doesn't install any packages. It specifies version constraints # that will be applied if a package is needed. @@ -8,8 +8,7 @@ # pin when possible. Writing an issue against the offending project and # linking to it here is good. -# This file contains all common constraints for edx-repos --c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt +-c common_constraints.txt astroid==1.6.6 requests==2.25.0 diff --git a/requirements/django.txt b/requirements/django.txt index 480c0782..5a28da34 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.20 +django==3.2.22 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index baf1aa51..50d35f22 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,20 +4,27 @@ # # make upgrade # -build==0.10.0 +build==1.0.3 # via pip-tools -click==8.1.3 +click==8.1.7 # via pip-tools -packaging==23.0 +importlib-metadata==6.8.0 # via build -pip-tools==6.12.3 +packaging==23.2 + # via build +pip-tools==7.3.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build -wheel==0.40.0 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.41.2 # via pip-tools +zipp==3.17.0 + # 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 896a85ce..3e7d8f4a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.0.1 +pip==23.2.1 # via -r requirements/pip.in -setuptools==67.6.1 +setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 53033e81..aaf91837 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django @@ -13,14 +13,12 @@ astroid==1.6.6 # -c requirements/constraints.txt # -r requirements/test.in # pylint -attrs==22.2.0 - # via pytest -certifi==2022.12.7 +certifi==2023.7.22 # via # -r requirements/base.txt # elasticsearch # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography @@ -30,37 +28,28 @@ chardet==3.0.4 # -r requirements/base.txt # diff-cover # requests -click==8.1.3 +click==8.1.7 # via # -r requirements/base.txt # code-annotations # edx-django-utils -code-annotations==1.3.0 +code-annotations==1.5.0 # via -r requirements/test.in colorama==0.4.6 # via pylint -coreapi==2.3.3 - # via - # -r requirements/base.txt - # drf-yasg -coreschema==0.0.4 - # via - # -r requirements/base.txt - # coreapi - # drf-yasg -coverage[toml]==7.2.2 +coverage[toml]==7.3.2 # via # -r requirements/test.in # pytest-cov -cryptography==40.0.1 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt ddt==1.6.0 # via -r requirements/test.in -diff-cover==7.5.0 +diff-cover==7.7.0 # via -r requirements/test.in -distlib==0.3.6 +distlib==0.3.7 # via virtualenv # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -68,19 +57,20 @@ distlib==0.3.6 # django-cors-headers # django-crum # django-nine + # django-waffle # djangorestframework # drf-jwt # drf-yasg # edx-django-release-util # edx-django-utils # edx-drf-extensions -django-cors-headers==3.14.0 +django-cors-headers==4.2.0 # via -r requirements/base.txt django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-elasticsearch-dsl==7.3 +django-elasticsearch-dsl==7.4 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -91,7 +81,7 @@ django-nine==0.2.7 # via # -r requirements/base.txt # django-elasticsearch-dsl-drf -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -107,17 +97,17 @@ drf-jwt==1.19.2 # via # -r requirements/base.txt # edx-drf-extensions -drf-yasg==1.21.5 +drf-yasg==1.21.7 # via -r requirements/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.3.0 +edx-django-utils==5.7.0 # via # -r requirements/base.txt # edx-drf-extensions -edx-drf-extensions==8.4.1 +edx-drf-extensions==8.10.0 # via -r requirements/base.txt -edx-opaque-keys==2.3.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -134,21 +124,17 @@ elasticsearch-dsl==7.4.1 # -r requirements/base.txt # django-elasticsearch-dsl # django-elasticsearch-dsl-drf -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via pytest -factory-boy==3.2.1 +factory-boy==3.3.0 # via -r requirements/test.in -faker==18.3.1 +faker==19.6.2 # via factory-boy -filelock==3.10.7 +filelock==3.12.4 # via # tox # virtualenv -future==0.18.3 - # via - # -r requirements/base.txt - # pyjwkest -gunicorn==20.1.0 +gunicorn==21.2.0 # via -r requirements/base.txt idna==2.10 # via @@ -160,38 +146,31 @@ inflection==0.5.1 # drf-yasg iniconfig==2.0.0 # via pytest -itypes==1.2.0 - # via - # -r requirements/base.txt - # coreapi jinja2==3.1.2 # via - # -r requirements/base.txt # code-annotations - # coreschema # diff-cover lazy-object-proxy==1.9.0 # via astroid -markupsafe==2.1.2 - # via - # -r requirements/base.txt - # jinja2 +markupsafe==2.1.3 + # via jinja2 more-itertools==5.0.0 # via # -c requirements/constraints.txt # -r requirements/test.in -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/base.txt newrelic==4.8.0.110 # via # -c requirements/constraints.txt # -r requirements/base.txt # edx-django-utils -packaging==23.0 +packaging==23.2 # via # -r requirements/base.txt # django-nine # drf-yasg + # gunicorn # pytest # tox path-py==9.1 @@ -204,14 +183,14 @@ pbr==5.11.1 # stevedore pep8==1.7.1 # via -r requirements/test.in -platformdirs==3.2.0 +platformdirs==3.11.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # diff-cover # pytest # tox -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils @@ -221,17 +200,9 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pycryptodomex==3.17 - # via - # -r requirements/base.txt - # pyjwkest -pygments==2.14.0 +pygments==2.16.1 # via diff-cover -pyjwkest==1.4.2 - # via - # -r requirements/base.txt - # edx-drf-extensions -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # drf-jwt @@ -248,12 +219,12 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.2.2 +pytest==7.4.2 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -261,37 +232,27 @@ python-dateutil==2.4.0 # via # -c requirements/constraints.txt # -r requirements/base.txt - # edx-drf-extensions # elasticsearch-dsl # faker python-slugify==8.0.1 # via code-annotations -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # django # djangorestframework # drf-yasg -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # code-annotations + # drf-yasg # edx-django-release-util requests==2.25.0 # via # -c requirements/constraints.txt # -r requirements/base.txt - # coreapi # edx-drf-extensions - # pyjwkest -ruamel-yaml==0.17.21 - # via - # -r requirements/base.txt - # drf-yasg -ruamel-yaml-clib==0.2.7 - # via - # -r requirements/base.txt - # ruamel-yaml semantic-version==2.10.0 # via # -r requirements/base.txt @@ -303,18 +264,16 @@ six==1.16.0 # django-elasticsearch-dsl # django-elasticsearch-dsl-drf # edx-django-release-util - # edx-drf-extensions # elasticsearch-dsl # more-itertools - # pyjwkest # pylint # python-dateutil # tox -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/base.txt # code-annotations @@ -331,20 +290,22 @@ tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.in +typing-extensions==4.8.0 + # via + # -r requirements/base.txt + # asgiref + # edx-opaque-keys + # faker uritemplate==4.1.1 # via # -r requirements/base.txt - # coreapi # drf-yasg -urllib3==1.26.15 +urllib3==1.26.17 # via # -r requirements/base.txt # elasticsearch # requests -virtualenv==20.21.0 +virtualenv==20.24.5 # via tox wrapt==1.15.0 # via astroid - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/travis.txt b/requirements/travis.txt index 95c46152..c4b2a642 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -4,32 +4,20 @@ # # make upgrade # -certifi==2022.12.7 - # via requests -chardet==3.0.4 - # via requests -coverage==7.2.2 - # via codecov -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.10.7 +filelock==3.12.4 # via # tox # virtualenv -idna==2.10 - # via requests -packaging==23.0 +packaging==23.2 # via tox -platformdirs==3.2.0 +platformdirs==3.11.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via tox py==1.11.0 # via tox -requests==2.25.0 - # via - # -c requirements/constraints.txt - # codecov six==1.16.0 # via tox tomli==2.0.1 @@ -39,9 +27,7 @@ tox==3.28.0 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/travis.in # tox-battery -tox-battery==0.6.1 +tox-battery==0.6.2 # via -r requirements/travis.in -urllib3==1.26.15 - # via requests -virtualenv==20.21.0 +virtualenv==20.24.5 # via tox diff --git a/tox.ini b/tox.ini index 193a8372..1809ae17 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = py38-django{32, 42} +envlist = py38-django{42} skipsdist = true [testenv] deps = - django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 -r {toxinidir}/requirements/test.txt passenv =