feat:Added support for django3.2 (#158)

openedx · Jul 9, 2021 · 7196e8a · 7196e8a
1 parent df30b21
commit 7196e8a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Python CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     branches:
       - '**'
@@ -13,14 +13,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ["3.8"]
-        toxenv: [
-          "django22-celery44-drf39", "django22-celery44-drf310",
-          "django22-celery44-drf311", "django22-celery44-drf312",
-          "django22-celery50-drf39", "django22-celery50-drf310",
-          "django22-celery50-drf311", "django22-celery50-drf312",
-          "quality", "docs"
-        ]
+        python-version: ['3.8']
+        toxenv: [django22-celery44-drflatest, django22-celery44-drf312, django22-celery50-drflatest,
+          django22-celery50-drf312, django30-celery44-drflatest, django30-celery44-drf312,
+          django30-celery50-drflatest, django30-celery50-drf312, django31-celery44-drflatest,
+          django31-celery44-drf312, django31-celery50-drflatest, django31-celery50-drf312,
+          django32-celery44-drflatest, django32-celery44-drf312, django32-celery50-drflatest,
+          django32-celery50-drf312, quality, docs]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,6 +16,14 @@ Unreleased
 
 *
 
+[2.1.0] - 2021-07-07
+~~~~~~~~~~~~~~~~~~~~
+
+Added
++++++
+
+* Support for django3.0, 3.1 and 3.2
+
 [2.0.3] - 2021-06-08
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/setup.py b/setup.py
@@ -80,6 +80,9 @@ def is_requirement(line):
         'Development Status :: 4 - Beta',
         'Framework :: Django',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',

diff --git a/tox.ini b/tox.ini
@@ -1,28 +1,27 @@
 [tox]
-envlist = py38-django{22,30,31}-celery{44,50}-drf{39,310,311,312},quality,docs
+envlist = py38-django{22,30,31,32}-celery{44,50}-drf{312,latest},quality,docs
 
 [testenv]
-deps = 
+deps =
 	django22: Django>=2.2,<2.3
 	django30: Django>=3.0,<3.1
 	django31: Django>=3.1,<3.2
-	drf39: djangorestframework>=3.9,<3.10
-	drf310: djangorestframework>=3.10,<3.11
-	drf311: djangorestframework>=3.11,<3.12
+	django32: Django>=3.2,<3.3
 	drf312: djangorestframework>=3.12,<3.13
+	drflatest: djangorestframework
 	celery44: -r{toxinidir}/requirements/celery44.txt
 	celery50: -r{toxinidir}/requirements/celery50.txt
 	-r{toxinidir}/requirements/test.txt
-commands = 
+commands =
 	python -Wd -m pytest {posargs}
 
 [testenv:docs]
-allowlist_externals = 
+allowlist_externals =
 	make
 	rm
-deps = 
+deps =
 	-r{toxinidir}/requirements/doc.txt
-commands = 
+commands =
 	doc8 --ignore-path docs/_build --ignore-path docs/rest_api.rst README.rst docs
 	rm -f docs/user_tasks.rst
 	rm -f docs/modules.rst
@@ -34,15 +33,15 @@ commands =
 [testenv:quality]
 setenv=
     DJANGO_SETTINGS_MODULE=test_settings
-allowlist_externals = 
+allowlist_externals =
 	make
 	rm
 	touch
-deps = 
+deps =
 	-r{toxinidir}/requirements/doc.txt
 	-r{toxinidir}/requirements/quality.txt
 	-r{toxinidir}/requirements/test.txt
-commands = 
+commands =
 	touch tests/__init__.py
 	pylint user_tasks
 	pylint tests

diff --git a/user_tasks/__init__.py b/user_tasks/__init__.py
@@ -4,7 +4,7 @@
 
 from django.dispatch import Signal
 
-__version__ = '2.0.3'
+__version__ = '2.1.0'
 
 default_app_config = 'user_tasks.apps.UserTasksConfig'  # pylint: disable=invalid-name