feat: Added Support for Django 3.2 (#537)

openedx · Jul 27, 2021 · 06381c6 · 06381c6
1 parent 486a5e1
commit 06381c6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,9 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=quality
   - TOX_ENV=django22
+  - TOX_ENV=django30
+  - TOX_ENV=django31
+  - TOX_ENV=django32
 
 script:
   - tox -e $TOX_ENV

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,11 @@ Change history for XBlock
 
 These are notable changes in XBlock.
 
+1.5.0 - 2021-07-27
+------------------
+
+* Added Django 3.0, 3.1 & 3.2 support
+
 1.4.2 - 2021-05-24
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -44,6 +44,9 @@
         'Development Status :: 5 - Production/Stable',
         '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,5 +1,5 @@
 [tox]
-envlist = py38-django{22,30,31}, quality, docs
+envlist = py38-django{22,30,31,32}, quality, docs
 
 [pytest]
 DJANGO_SETTINGS_MODULE = xblock.test.settings
@@ -13,6 +13,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 requirements/test.txt
 changedir = {envsitepackagesdir}
 commands =

diff --git a/xblock/VERSION.txt b/xblock/VERSION.txt
@@ -1 +1 @@
-1.4.2
+1.5.0
diff --git a/xblock/test/django/test_field_translation.py b/xblock/test/django/test_field_translation.py
@@ -7,7 +7,7 @@
 from unittest.mock import Mock
 from django.test import TestCase
 from django.utils import translation
-from django.utils.translation import ugettext_lazy as _  # pylint: disable=import-error
+from django.utils.translation import gettext_lazy as _  # pylint: disable=import-error
 
 from xblock.core import XBlock
 from xblock.fields import FailingEnforceTypeWarning, Scope, String, ScopeIds