chore: Post Django 3.2 cleanup (#237)

Co-authored-by: Mohammad Ahtasham ul Hassan <[email protected]>

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8']
-        toxenv: [django22, django30, django31, django32, quality]
+        toxenv: [django32, django40, quality]
 
     steps:
     - uses: actions/checkout@v2
@@ -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

organizations/__init__.py

@@ -1,4 +1,4 @@
 """
 edx-organizations app initialization module
 """
-__version__ = '6.10.1'  # pragma: no cover
+__version__ = '6.11.0'  # pragma: no cover

organizations/urls.py

@@ -1,7 +1,7 @@
 """
 URLS for organizations
 """
-from django.conf.urls import re_path, include
+from django.urls import include, re_path
 
 app_name = 'organizations'  # pylint: disable=invalid-name
 urlpatterns = [

setup.py

@@ -2,7 +2,7 @@
 import os
 import re
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 def load_requirements(*requirements_paths):
@@ -57,10 +57,8 @@ def get_version(*file_paths):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         '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',
         'Operating System :: OS Independent',

tox.ini

@@ -1,25 +1,23 @@
 [tox]
-envlist = py38-django{22,30,31,32}, quality
+envlist = py38-django{32,40}, quality
 
 [testenv]
 setenv = 
-	DJANGO_SETTINGS_MODULE = test_settings
-	PYTHONPATH = {toxinidir}
+    DJANGO_SETTINGS_MODULE = test_settings
+    PYTHONPATH = {toxinidir}
 deps = 
-	django22: Django>=2.2,<2.3
-	django30: Django>=3.0,<3.1
-	django31: Django>=3.1,<3.2
-	django32: Django>=3.2,<4.0
-	-rtest-requirements.txt
+    django32: Django>=3.2,<4.0
+    django40: Django>=4.0,<4.1
+    -rtest-requirements.txt
 commands = 
-	python -Wd -m pytest {posargs}
-	coverage report
+    python -Wd -m pytest {posargs}
+    coverage report
 
 [testenv:quality]
 deps = 
-	Django>=2.2,<2.3
-	-rtest-requirements.txt
+    Django>=3.2,<4.0
+    -rtest-requirements.txt
 commands = 
-	pycodestyle organizations
-	pylint --rcfile=pylintrc organizations
+    pycodestyle organizations
+    pylint --rcfile=pylintrc organizations