fix: Added support for Django 4.2 (#215)

* fix: Support added for Django 4.2 * fix: celery53 added and django40,41 removed * fix: default_app_config removed for removing warns * fix: djnago-upgrade run. * fix: url.py reverted * fix: admin.py reverted
openedx · Jul 26, 2023 · 57533cb · 57533cb
1 parent c9e60b2
commit 57533cb
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 65 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
  matrix:
  os: [ubuntu-20.04]
  python-version: ['3.8']
- toxenv: [quality, docs, django32, django40]
+ toxenv: [quality, docs, django32, django42]
 
  steps:
  - uses: actions/checkout@v3

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+
+
+[1.2.3] - 2023-06-15
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Support added for Django 4.2.
 * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
  deprecated
 

diff --git a/celery_utils/__init__.py b/celery_utils/__init__.py
@@ -2,6 +2,4 @@
 Code to support working with celery.
 """
 
-__version__ = '1.2.2'
-
-default_app_config = 'celery_utils.apps.CeleryUtilsConfig' # pylint: disable=invalid-name
+__version__ = '1.2.3'
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -18,7 +18,7 @@ celery==5.3.1
  # via
  # -c requirements/constraints.txt
  # -r requirements/base.in
-click==8.1.4
+click==8.1.6
  # via
  # celery
  # click-didyoumean

diff --git a/requirements/celery50.txt b/requirements/celery50.txt
@@ -1,7 +1,7 @@
 amqp==5.1.1
 billiard==4.1.0
 celery==5.3.1
-click==8.1.4
+click==8.1.6
 click-didyoumean==0.3.0
 click-repl==0.3.0
 kombu==5.3.1

diff --git a/requirements/celery53.txt b/requirements/celery53.txt
@@ -0,0 +1,9 @@
+amqp==5.1.1
+billiard==4.1.0
+celery==5.3.1
+click==8.1.6
+click-didyoumean==0.3.0
+click-repl==0.3.0
+kombu==5.3.1
+prompt-toolkit==3.0.39
+vine==5.0.0
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,15 +4,15 @@
 #
 # make upgrade
 #
-distlib==0.3.6
+distlib==0.3.7
  # via virtualenv
 filelock==3.12.2
  # via
  # tox
  # virtualenv
 packaging==23.1
  # via tox
-platformdirs==3.8.1
+platformdirs==3.9.1
  # via virtualenv
 pluggy==1.2.0
  # via tox
@@ -29,5 +29,5 @@ tox==3.28.0
  # tox-battery
 tox-battery==0.6.1
  # via -r requirements/ci.in
-virtualenv==20.23.1
+virtualenv==20.24.2
  # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -12,30 +12,26 @@ astroid==2.15.6
  # pylint-celery
 bleach==6.0.0
  # via readme-renderer
-certifi==2023.5.7
+certifi==2023.7.22
  # via requests
-cffi==1.15.1
- # via cryptography
 chardet==5.1.0
  # via diff-cover
 charset-normalizer==3.2.0
  # via requests
-click==8.1.4
+click==8.1.6
  # via
  # click-log
  # code-annotations
  # edx-lint
 click-log==0.4.0
  # via edx-lint
-code-annotations==1.3.0
+code-annotations==1.5.0
  # via edx-lint
-cryptography==41.0.2
- # via secretstorage
-diff-cover==7.6.1
+diff-cover==7.7.0
  # via -r requirements/dev.in
-dill==0.3.6
+dill==0.3.7
  # via pylint
-distlib==0.3.6
+distlib==0.3.7
  # via virtualenv
 django==3.2.20
  # via
@@ -67,10 +63,6 @@ isort==5.12.0
  # pylint
 jaraco-classes==3.3.0
  # via keyring
-jeepney==0.8.0
- # via
- # keyring
- # secretstorage
 jinja2==3.1.2
  # via
  # code-annotations
@@ -87,7 +79,7 @@ mccabe==0.7.0
  # via pylint
 mdurl==0.1.2
  # via markdown-it-py
-more-itertools==9.1.0
+more-itertools==10.0.0
  # via jaraco-classes
 packaging==23.1
  # via tox
@@ -97,7 +89,7 @@ pbr==5.11.1
  # via stevedore
 pkginfo==1.9.6
  # via twine
-platformdirs==3.8.1
+platformdirs==3.9.1
  # via
  # pylint
  # virtualenv
@@ -111,8 +103,6 @@ py==1.11.0
  # via tox
 pycodestyle==2.10.0
  # via -r requirements/quality.in
-pycparser==2.21
- # via cffi
 pydocstyle==3.0.0
  # via -r requirements/quality.in
 pygments==2.15.1
@@ -138,7 +128,7 @@ python-slugify==8.0.1
  # via code-annotations
 pytz==2023.3
  # via django
-pyyaml==6.0
+pyyaml==6.0.1
  # via
  # code-annotations
  # edx-i18n-tools
@@ -154,8 +144,6 @@ rfc3986==2.0.0
  # via twine
 rich==13.4.2
  # via twine
-secretstorage==3.3.3
- # via keyring
 six==1.16.0
  # via
  # bleach
@@ -191,19 +179,19 @@ typing-extensions==4.7.1
  # astroid
  # pylint
  # rich
-urllib3==2.0.3
+urllib3==2.0.4
  # via
  # requests
  # twine
-virtualenv==20.23.1
+virtualenv==20.24.2
  # via tox
 webencodings==0.5.1
  # via bleach
-wheel==0.40.0
+wheel==0.41.0
  # via -r requirements/dev.in
 wrapt==1.15.0
  # via astroid
-zipp==3.16.0
+zipp==3.16.2
  # via
  # importlib-metadata
  # importlib-resources
diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -32,13 +32,11 @@ celery==5.3.1
  # via
  # -c requirements/constraints.txt
  # -r requirements/base.in
-certifi==2023.5.7
+certifi==2023.7.22
  # via requests
-cffi==1.15.1
- # via cryptography
 charset-normalizer==3.2.0
  # via requests
-click==8.1.4
+click==8.1.6
  # via
  # celery
  # click-didyoumean
@@ -50,8 +48,6 @@ click-plugins==1.1.1
  # via celery
 click-repl==0.3.0
  # via celery
-cryptography==41.0.2
- # via secretstorage
 django==3.2.20
  # via
  # -c requirements/common_constraints.txt
@@ -82,10 +78,6 @@ importlib-resources==6.0.0
  # via keyring
 jaraco-classes==3.3.0
  # via keyring
-jeepney==0.8.0
- # via
- # keyring
- # secretstorage
 jinja2==3.1.2
  # via sphinx
 jsonfield==3.1.0
@@ -100,7 +92,7 @@ markupsafe==2.1.3
  # via jinja2
 mdurl==0.1.2
  # via markdown-it-py
-more-itertools==9.1.0
+more-itertools==10.0.0
  # via jaraco-classes
 packaging==23.1
  # via
@@ -115,8 +107,6 @@ pockets==0.9.1
  # via sphinxcontrib-napoleon
 prompt-toolkit==3.0.39
  # via click-repl
-pycparser==2.21
- # via cffi
 pydata-sphinx-theme==0.13.3
  # via sphinx-book-theme
 pygments==2.15.1
@@ -150,8 +140,6 @@ rfc3986==2.0.0
  # via twine
 rich==13.4.2
  # via twine
-secretstorage==3.3.3
- # via keyring
 six==1.16.0
  # via
  # bleach
@@ -204,7 +192,7 @@ tzdata==2023.3
  # via
  # backports-zoneinfo
  # celery
-urllib3==2.0.3
+urllib3==2.0.4
  # via
  # requests
  # twine
@@ -217,7 +205,7 @@ wcwidth==0.2.6
  # via prompt-toolkit
 webencodings==0.5.1
  # via bleach
-zipp==3.16.0
+zipp==3.16.2
  # via
  # importlib-metadata
  # importlib-resources
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -6,19 +6,19 @@
 #
 build==0.10.0
  # via pip-tools
-click==8.1.4
+click==8.1.6
  # via pip-tools
 packaging==23.1
  # via build
-pip-tools==6.14.0
+pip-tools==7.1.0
  # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
  # via build
 tomli==2.0.1
  # via
  # build
  # pip-tools
-wheel==0.40.0
+wheel==0.41.0
  # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -4,11 +4,11 @@
 #
 # make upgrade
 #
-wheel==0.40.0
+wheel==0.41.0
  # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.1.2
+pip==23.2.1
  # via -r requirements/pip.in
 setuptools==68.0.0
  # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -8,16 +8,16 @@ astroid==2.15.6
  # via
  # pylint
  # pylint-celery
-click==8.1.4
+click==8.1.6
  # via
  # click-log
  # code-annotations
  # edx-lint
 click-log==0.4.0
  # via edx-lint
-code-annotations==1.3.0
+code-annotations==1.5.0
  # via edx-lint
-dill==0.3.6
+dill==0.3.7
  # via pylint
 edx-lint==5.3.4
  # via -r requirements/quality.in
@@ -35,7 +35,7 @@ mccabe==0.7.0
  # via pylint
 pbr==5.11.1
  # via stevedore
-platformdirs==3.8.1
+platformdirs==3.9.1
  # via pylint
 pycodestyle==2.10.0
  # via -r requirements/quality.in
@@ -57,7 +57,7 @@ pylint-plugin-utils==0.8.2
  # pylint-django
 python-slugify==8.0.1
  # via code-annotations
-pyyaml==6.0
+pyyaml==6.0.1
  # via code-annotations
 six==1.16.0
  # via

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -15,7 +15,7 @@ backports-zoneinfo[tzdata]==0.2.1
  # via
  # -c requirements/constraints.txt
  # -r requirements/base.in
-click==8.1.4
+click==8.1.6
  # via
  # celery
  # click-didyoumean

diff --git a/setup.py b/setup.py
@@ -120,6 +120,8 @@ def is_requirement(line):
  'Framework :: Django',
  'Framework :: Django :: 3.2',
  'Framework :: Django :: 4.0',
+ 'Framework :: Django :: 4.1',
+ 'Framework :: Django :: 4.2',
  'Intended Audience :: Developers',
  'License :: OSI Approved :: Apache Software License',
  'Natural Language :: English',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-celery{50}-django{32,40},quality,docs
+envlist = py38-celery{50}-django{32,40,41,42},quality,docs
 
 [doc8]
 ignore = D001
@@ -20,8 +20,8 @@ norecursedirs = .* docs requirements
 [testenv]
 deps = 
  django32: Django>=3.2,<4.0
- django40: Django>=4.0,<4.1
- celery50: -r{toxinidir}/requirements/celery50.txt
+ django42: Django>=4.2,<4.3
+ celery53: -r{toxinidir}/requirements/celery53.txt
  -r{toxinidir}/requirements/test.txt
 commands = 
  py.test tests/ celery_utils/ {posargs}