Merge pull request #196 from openedx/jenkins/cleanup-python-code-ea294dc

chore: Post Django32 Cleanup

Author: aht007

.github/workflows/ci.yml

@@ -16,8 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8']
-        toxenv: [django22-drflatest, quality, docs, django30-drflatest,
-          django31-drflatest, django32-drflatest]
+        toxenv: [quality, docs, django32-drflatest, django40-drflatest]
     steps:
     - uses: actions/checkout@v1
     - name: setup python
@@ -37,7 +36,7 @@ jobs:
       run: tox
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django22-drflatest'
+      if: matrix.python-version == '3.8' && matrix.toxenv=='django32-drflatest'
       uses: codecov/codecov-action@v1
       with:
         flags: unittests

CHANGELOG.rst

@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[2.3.0] - 2022-01-19
+~~~~~~~~~~~~~~~~~~~~
+* Added Support for Django40 in CI
+* Dropped Support for Django22, 30, 31
+
 [2.2.2] - 2021-20-12
 ~~~~~~~~~~~~~~~~~~~~
 * Updated dependencies after removing unnecessary constraint on edx-django-utils, so the constraint will no longer be advertised.

config_models/__init__.py

@@ -2,6 +2,6 @@
 Configuration models for Django allowing config management with auditing.
 """
 
-__version__ = '2.2.2'
+__version__ = '2.3.0'
 
 default_app_config = 'config_models.apps.ConfigModelsConfig'  # pylint: disable=invalid-name

setup.py

@@ -117,10 +117,8 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Natural Language :: English',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-django{22,30,31,32}-drf{latest},quality,docs
+envlist = py38-django{32,40}-drf{latest},quality,docs
 
 [pycodestyle]
 exclude = .git,.tox,migrations
@@ -14,47 +14,45 @@ addopts = --cov config_models --cov-report term-missing
 norecursedirs = .* docs requirements
 
 [testenv]
-setenv =
-	PYTHONPATH = {toxinidir}/mock_apps
-	DJANGO_SETTINGS_MODULE = test_settings
-deps =
-	django22: Django>=2.2,<2.3
-	django30: Django>=3.0,<3.1
-	django31: Django>=3.1,<3.2
-	django32: Django>=3.2,<3.3
-	drflatest: djangorestframework
-	-r{toxinidir}/requirements/test.txt
-commands =
-	python -Wd -m pytest {posargs}
+setenv = 
+    PYTHONPATH = {toxinidir}/mock_apps
+    DJANGO_SETTINGS_MODULE = test_settings
+deps = 
+    django32: Django>=3.2,<4.0
+    django40: Django>=4.0,<4.1
+    drflatest: djangorestframework
+    -r{toxinidir}/requirements/test.txt
+commands = 
+    python -Wd -m pytest {posargs}
 
 [testenv:docs]
-setenv =
-	DJANGO_SETTINGS_MODULE = test_settings
-	PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
-whitelist_externals =
-	make
-	rm
-deps =
-	-r{toxinidir}/requirements/doc.txt
-commands =
-	rm -f docs/config_models.rst
-	rm -f docs/modules.rst
-	sphinx-apidoc -o docs/ config_models
-	make -C docs clean
-	make -C docs html
-	python setup.py bdist_wheel
-	twine check dist/*
+setenv = 
+    DJANGO_SETTINGS_MODULE = test_settings
+    PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
+whitelist_externals = 
+    make
+    rm
+deps = 
+    -r{toxinidir}/requirements/doc.txt
+commands = 
+    rm -f docs/config_models.rst
+    rm -f docs/modules.rst
+    sphinx-apidoc -o docs/ config_models
+    make -C docs clean
+    make -C docs html
+    python setup.py bdist_wheel
+    twine check dist/*
 
 [testenv:quality]
-whitelist_externals =
-	make
-	rm
-	touch
-deps =
-	-r{toxinidir}/requirements/quality.txt
-commands =
-	pylint config_models
-	pylint tests
-	pycodestyle config_models tests
-	make help
+whitelist_externals = 
+    make
+    rm
+    touch
+deps = 
+    -r{toxinidir}/requirements/quality.txt
+commands = 
+    pylint config_models
+    pylint tests
+    pycodestyle config_models tests
+    make help