Merge pull request #42 from openedx/jenkins/cleanup-python-code-f1a1997

chore: Post Django32 Cleanup

.github/workflows/ci.yml

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

CHANGELOG.rst

@@ -11,6 +11,11 @@ Change Log
 
 .. There should always be an "Unreleased" section for changes pending release.
 
+[2.2.0] - 2022-01-20
+====================
+
+* Dropped support for django2.2, 3.0, 3.1 and 3.2
+* Added Django40 support in CI
 
 [2.1.0] - 2020-07-07
 ====================

help_tokens/__init__.py

@@ -4,6 +4,6 @@
 
 from .context_processor import context_processor
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 default_app_config = 'help_tokens.apps.HelpTokensConfig'  # pylint: disable=invalid-name

setup.py

@@ -118,10 +118,8 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         '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}, quality
+envlist = py38-django{32,40}, quality
 
 [pycodestyle]
 exclude = .git,.tox,migrations
@@ -15,32 +15,30 @@ addopts = --cov help_tokens --cov-report term-missing --cov-report xml
 norecursedirs = .* requirements
 
 [testenv]
-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
-	-r{toxinidir}/requirements/test.txt
+deps = 
+    django32: Django>=3.2,<4.0
+    django40: Django>=4.0,<4.1
+    -r{toxinidir}/requirements/test.txt
 commands = 
-	python -Wd -m pytest {posargs}
+    python -Wd -m pytest {posargs}
 
 [testenv:quality]
-setenv =
-	DJANGO_SETTINGS_MODULE = test_settings
+setenv = 
+    DJANGO_SETTINGS_MODULE = test_settings
 whitelist_externals = 
-	make
-	rm
-	touch
+    make
+    rm
+    touch
 deps = 
-	-r{toxinidir}/requirements/quality.txt
-	-r{toxinidir}/requirements/test.txt
+    -r{toxinidir}/requirements/quality.txt
+    -r{toxinidir}/requirements/test.txt
 commands = 
-	touch tests/__init__.py
-	pylint help_tokens tests
-	rm tests/__init__.py
-	pycodestyle help_tokens tests
-	pydocstyle help_tokens tests
-	python setup.py check --restructuredtext --strict
-	isort --check-only --recursive tests help_tokens manage.py setup.py test_settings.py
-	make selfcheck
+    touch tests/__init__.py
+    pylint help_tokens tests
+    rm tests/__init__.py
+    pycodestyle help_tokens tests
+    pydocstyle help_tokens tests
+    python setup.py check --restructuredtext --strict
+    isort --check-only tests help_tokens manage.py setup.py test_settings.py
+    make selfcheck