Merge pull request #71 from edx/django32-support

BOM-2707: Added Support for Django 3.2
openedx · Jul 27, 2021 · eea6aaa · eea6aaa
2 parents dc98f7d + d657a03
commit eea6aaa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ env:
   - TOXENV=django22
   - TOXENV=django30
   - TOXENV=django31
+  - TOXENV=django32
 cache:
   - pip
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+[1.2.0] - 2021-07-26
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Added Django 3.0, 3.1 & 3.2 Support
+
 [1.1.2] - 2021-05-21
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/code_annotations/__init__.py b/code_annotations/__init__.py
@@ -2,4 +2,4 @@
 Extensible tools for parsing annotations in codebases.
 """
 
-__version__ = '1.1.2'
+__version__ = '1.2.0'
diff --git a/setup.py b/setup.py
@@ -97,12 +97,14 @@ def is_requirement(line):
         'Development Status :: 3 - Alpha',
         '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',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.8',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist =  py38-django{22,30,31}
+envlist =  py38-django{22,30,31,32}
 
 [doc8]
 ignore = D001
@@ -20,6 +20,7 @@ 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
 commands =
 	python -Wd -m pytest {posargs}