feat: add support for Django 4.2

open-craft · Aug 4, 2023 · b54b9e5 · b54b9e5
1 parent 42c2d2f
commit b54b9e5
Show file tree

Hide file tree

Showing 18 changed files with 179 additions and 97 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: [3.8]
-        toxenv: [py38-django32, integration, quality]
+        toxenv: [py38-django32, py38-django42, integration32, integration42, quality]
 
     steps:
     - name: checkout repo
@@ -40,7 +40,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Install Required System Packages
-      if: matrix.toxenv == 'integration'
+      if: ${{ startsWith(matrix.toxenv, 'integration') }}
       run: |
         sudo apt-get update
         sudo apt-get install -y xvfb

diff --git a/AUTHORS b/AUTHORS
@@ -10,3 +10,4 @@ Eugeny Kolpakov <eugeny@opencraft.com>
 Braden MacDonald <braden@opencraft.com>
 Jonathan Piacenti <jonathan@opencraft.com>
 Tim Krones <tim@opencraft.com>
+Irtaza Akram <irtaza.akram@arbisoft.com>
diff --git a/Makefile b/Makefile
@@ -102,6 +102,6 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
 	$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
 	$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
-	# Let tox control the Django version for tests
-	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
-	mv requirements/test.tmp requirements/test.txt
+	# Let tox control the Django version for tests & integration
+	sed -i '/^[dD]jango==/d' requirements/test.txt
+	sed -i '/^[dD]jango==/d' requirements/workbench.txt
diff --git a/problem_builder/__init__.py b/problem_builder/__init__.py
@@ -1 +1 @@
-__version__ = "5.1.3"
+__version__ = "5.1.4"
diff --git a/problem_builder/dashboard.py b/problem_builder/dashboard.py
@@ -156,7 +156,7 @@ def eval_(node):
             elif isinstance(node, ast.Name) and node.id == "x":
                 return x
             elif isinstance(node, ast.BoolOp):  # Boolean operator: either "and" or "or" with two or more values
-                if type(node.op) == ast.And:
+                if isinstance(node.op, ast.And):
                     return all(eval_(val) for val in node.values)
                 else:  # Or:
                     for val in node.values:

diff --git a/problem_builder/tests/unit/test_answer_mixin.py b/problem_builder/tests/unit/test_answer_mixin.py
@@ -25,7 +25,7 @@ def setUp(self):
 
     def make_answer_mixin(self, name=None, course_id=None, student_id=None):
         if name is None:
-            name = get_random_string()
+            name = get_random_string(12)
         if course_id is None:
             course_id = self.course_id
         if student_id is None:

diff --git a/pylintrc b/pylintrc
@@ -773,4 +773,4 @@ known-third-party=enchant
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -34,7 +34,7 @@ pytz==2023.3
     # via
     #   django
     #   xblock
-pyyaml==6.0
+pyyaml==6.0.1
     # via xblock
 simplejson==3.19.1
     # via xblock-utils
@@ -48,15 +48,15 @@ stevedore==5.1.0
     # via edx-opaque-keys
 typing-extensions==4.7.1
     # via asgiref
-web-fragments==2.0.0
+web-fragments==2.1.0
     # via
     #   xblock
     #   xblock-utils
 webob==1.8.7
     # via xblock
-xblock==1.6.2
+xblock==1.7.0
     # via xblock-utils
-xblock-utils==3.2.0
+xblock-utils==3.3.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,15 +4,15 @@
 #
 #    make upgrade
 #
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
 filelock==3.12.2
     # via
     #   tox
     #   virtualenv
 packaging==23.1
     # via tox
-platformdirs==3.9.1
+platformdirs==3.10.0
     # via virtualenv
 pluggy==1.2.0
     # via tox
@@ -29,5 +29,5 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-virtualenv==20.24.0
+virtualenv==20.24.2
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -33,12 +33,12 @@ bok-choy==0.7.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/workbench.txt
-boto3==1.28.3
+boto3==1.28.19
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   fs-s3fs
-botocore==1.31.3
+botocore==1.31.19
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -48,12 +48,12 @@ build==0.10.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-certifi==2023.5.7
+certifi==2023.7.22
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   requests
-chardet==5.1.0
+chardet==5.2.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -63,7 +63,7 @@ charset-normalizer==3.2.0
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   requests
-click==8.1.5
+click==8.1.6
     # via
     #   -r requirements/pip-tools.txt
     #   -r requirements/quality.txt
@@ -77,12 +77,12 @@ click-log==0.4.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-code-annotations==1.3.0
+code-annotations==1.5.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   edx-lint
-cookiecutter==2.2.3
+cookiecutter==2.3.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -96,11 +96,11 @@ ddt==1.6.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
-dill==0.3.6
+dill==0.3.7
     # via
     #   -r requirements/quality.txt
     #   pylint
-distlib==0.3.6
+distlib==0.3.7
     # via
     #   -r requirements/ci.txt
     #   virtualenv
@@ -119,11 +119,11 @@ django-appconf==1.0.5
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   django-statici18n
-django-statici18n==2.3.1
+django-statici18n==2.4.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
-edx-i18n-tools==1.0.0
+edx-i18n-tools==1.1.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -203,6 +203,11 @@ mako==1.2.4
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   xblock-utils
+markdown-it-py==3.0.0
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/workbench.txt
+    #   rich
 markupsafe==2.1.3
     # via
     #   -r requirements/quality.txt
@@ -214,6 +219,11 @@ mccabe==0.7.0
     # via
     #   -r requirements/quality.txt
     #   pylint
+mdurl==0.1.2
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/workbench.txt
+    #   markdown-it-py
 mock==5.1.0
     # via
     #   -r requirements/quality.txt
@@ -256,9 +266,9 @@ pillow==10.0.0
     # via
     #   -r requirements/workbench.txt
     #   needle
-pip-tools==7.0.0
+pip-tools==7.2.0
     # via -r requirements/pip-tools.txt
-platformdirs==3.9.1
+platformdirs==3.10.0
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
@@ -280,11 +290,16 @@ py==1.11.0
     # via
     #   -r requirements/ci.txt
     #   tox
-pycodestyle==2.10.0
+pycodestyle==2.11.0
     # via -r requirements/quality.txt
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
-pylint==2.17.4
+pygments==2.15.1
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/workbench.txt
+    #   rich
+pylint==2.17.5
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -351,7 +366,7 @@ pytz==2023.3
     #   -r requirements/workbench.txt
     #   django
     #   xblock
-pyyaml==6.0
+pyyaml==6.0.1
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -365,6 +380,11 @@ requests==2.31.0
     #   -r requirements/workbench.txt
     #   cookiecutter
     #   xblock-sdk
+rich==13.5.2
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/workbench.txt
+    #   cookiecutter
 s3transfer==0.6.1
     # via
     #   -r requirements/quality.txt
@@ -425,7 +445,7 @@ tomli==2.0.1
     #   pyproject-hooks
     #   pytest
     #   tox
-tomlkit==0.11.8
+tomlkit==0.12.1
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -443,18 +463,19 @@ typing-extensions==4.7.1
     #   asgiref
     #   astroid
     #   pylint
+    #   rich
 urllib3==1.26.16
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   botocore
     #   requests
     #   selenium
-virtualenv==20.24.0
+virtualenv==20.24.2
     # via
     #   -r requirements/ci.txt
     #   tox
-web-fragments==2.0.0
+web-fragments==2.1.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
@@ -467,25 +488,25 @@ webob==1.8.7
     #   -r requirements/workbench.txt
     #   xblock
     #   xblock-sdk
-wheel==0.40.0
+wheel==0.41.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
 wrapt==1.15.0
     # via
     #   -r requirements/quality.txt
     #   astroid
-xblock[django]==1.6.2
+xblock[django]==1.7.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
     #   xblock-sdk
     #   xblock-utils
-xblock-sdk==0.6.0
+xblock-sdk==0.7.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt
-xblock-utils==3.2.0
+xblock-utils==3.3.0
     # via
     #   -r requirements/quality.txt
     #   -r requirements/workbench.txt

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -6,11 +6,11 @@
 #
 build==0.10.0
     # via pip-tools
-click==8.1.5
+click==8.1.6
     # via pip-tools
 packaging==23.1
     # via build
-pip-tools==7.0.0
+pip-tools==7.2.0
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
     # via build
@@ -19,7 +19,7 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.40.0
+wheel==0.41.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.40.0
+wheel==0.41.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2
+pip==23.2.1
     # via -r requirements/pip.in
 setuptools==68.0.0
     # via -r requirements/pip.in