Merge pull request #125 from openedx/salman/add-django-4.2-support

Add Django 4.2 support

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8']
-        toxenv: [django32, quality, csslint, eslint, translations_validate]
+        toxenv: [django32, django42, quality, csslint, eslint, translations_validate]
 
     steps:
     - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 3.1.0
+* Added support for Django 4.2
+
 ## Version 3.0.0
 * Removed Support for Django 2.2, 3.0 and 3.1
 

freetextresponse/__init__.py

@@ -4,4 +4,4 @@
 present in order for the student to receive credit.
 """
 
-__version__ = "3.0.0"
+__version__ = "3.1.0"

requirements/quality.txt

@@ -37,7 +37,7 @@ certifi==2023.7.22
     # via
     #   -r requirements/test.txt
     #   requests
-chardet==5.1.0
+chardet==5.2.0
     # via
     #   -r requirements/test.txt
     #   binaryornot
@@ -65,7 +65,6 @@ django==3.2.20
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   django-pyfs
-    #   openedx-django-pyfs
     #   xblock-sdk
 django-pyfs==3.2.0
     # via -r requirements/test.txt
@@ -77,13 +76,11 @@ fs==2.4.16
     #   -r requirements/test.txt
     #   django-pyfs
     #   fs-s3fs
-    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
     # via
     #   -r requirements/test.txt
     #   django-pyfs
-    #   openedx-django-pyfs
     #   xblock-sdk
 idna==3.4
     # via
@@ -101,9 +98,7 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.5
-    # via
-    #   -r requirements/test.txt
-    #   xblock
+    # via -r requirements/test.txt
 lazy-object-proxy==1.9.0
     # via astroid
 lxml==4.9.3
@@ -128,10 +123,6 @@ mccabe==0.7.0
     # via pylint
 mock==5.1.0
     # via -r requirements/test.txt
-openedx-django-pyfs==3.4.0
-    # via
-    #   -r requirements/test.txt
-    #   xblock
 pbr==5.11.1
     # via
     #   -r requirements/test.txt
@@ -239,13 +230,13 @@ webob==1.8.7
     #   xblock-sdk
 wrapt==1.15.0
     # via astroid
-xblock[django]==1.6.2
+xblock==1.6.2
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   xblock-sdk
     #   xblock-utils
-xblock-sdk==0.6.0
+xblock-sdk==0.7.0
     # via -r requirements/test.txt
 xblock-utils==3.3.0
     # via

requirements/test.txt

@@ -20,7 +20,7 @@ botocore==1.31.16
     #   s3transfer
 certifi==2023.7.22
     # via requests
-chardet==5.1.0
+chardet==5.2.0
     # via binaryornot
 charset-normalizer==3.2.0
     # via requests
@@ -35,7 +35,6 @@ ddt==1.6.0
     # via
     #   -c requirements/common_constraints.txt
     #   django-pyfs
-    #   openedx-django-pyfs
     #   xblock-sdk
 django-pyfs==3.2.0
     # via -r requirements/test.in
@@ -45,12 +44,10 @@ fs==2.4.16
     # via
     #   django-pyfs
     #   fs-s3fs
-    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
     # via
     #   django-pyfs
-    #   openedx-django-pyfs
     #   xblock-sdk
 idna==3.4
     # via requests
@@ -61,9 +58,7 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.5
-    # via
-    #   -r requirements/test.in
-    #   xblock
+    # via -r requirements/test.in
 lxml==4.9.3
     # via
     #   xblock
@@ -77,8 +72,6 @@ markupsafe==2.1.3
     #   xblock
 mock==5.1.0
     # via -r requirements/test.in
-openedx-django-pyfs==3.4.0
-    # via xblock
 pbr==5.11.1
     # via stevedore
 pymongo==3.13.0
@@ -136,11 +129,11 @@ webob==1.8.7
     # via
     #   xblock
     #   xblock-sdk
-xblock[django]==1.6.2
+xblock==1.6.2
     # via
     #   xblock-sdk
     #   xblock-utils
-xblock-sdk==0.6.0
+xblock-sdk==0.7.0
     # via -r requirements/test.in
 xblock-utils==3.3.0
     # via -r requirements/test.in

setup.py

@@ -149,6 +149,7 @@ def is_requirement(line):
         'Programming Language :: Python :: 3.8',
         'Framework :: Django',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.2',
         'Topic :: Education',
         'Topic :: Internet :: WWW/HTTP',
     ],

tox.ini

@@ -1,10 +1,11 @@
 [tox]
-envlist = csslint,eslint,pycodestyle,pylint,py38-django{32}, translations_validate
+envlist = csslint,eslint,pycodestyle,pylint,py38-django{32,42}, translations_validate
 
 [testenv]
 usedevelop = True
 deps = 
     django32: Django>=3.2,<4.0
+    django42: Django>=4.2,<4.3
     -rrequirements/test.txt
 commands = 
     coverage run manage.py test freetextresponse.tests
@@ -43,7 +44,7 @@ commands =
     pylint freetextresponse/
 
 [testenv:translations_validate]
-commands =
+commands = 
     make translations_validate
 
 [testenv:translations_push]
@@ -54,37 +55,37 @@ commands =
 
 [testenv:translations_pull]
 deps = 
-    edx-i18n-tools==0.4.8
+   edx-i18n-tools==0.4.8
     transifex-client
 changedir = {toxinidir}/freetextresponse
 commands = 
     i18n_tool transifex pull
 
 [testenv:translations_compile]
 deps = 
-    edx-i18n-tools==0.4.8
+   edx-i18n-tools==0.4.8
 changedir = {toxinidir}/freetextresponse
 commands = 
     i18n_tool generate
 
 [testenv:translations_dummy]
 deps = 
-    edx-i18n-tools==0.4.8
+   edx-i18n-tools==0.4.8
 changedir = {toxinidir}/freetextresponse
 commands = 
     i18n_tool dummy
 
 [testenv:translations_detect_changed]
 deps = 
-    edx-i18n-tools==0.4.8
+   edx-i18n-tools==0.4.8
 changedir = {toxinidir}/freetextresponse
 commands = 
     i18n_tool extract
     i18n_tool changed
 
 [testenv:translations_extract]
 deps = 
-    edx-i18n-tools==0.4.8
+   edx-i18n-tools==0.4.8
 changedir = {toxinidir}/freetextresponse
 commands = 
     i18n_tool extract