Merge branch 'master' into xblock2

openedx · Mar 29, 2024 · 7d68cf6 · 7d68cf6
2 parents 5f9f9cd + 8c79958
commit 7d68cf6
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 462 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
+        python-version: ['3.8', '3.11']
         node-version: [16]
-        toxenv: [quality, js, django32, django42]
+        toxenv: [quality, js, django42]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

diff --git a/openassessment/__init__.py b/openassessment/__init__.py
@@ -2,4 +2,4 @@
 Initialization Information for Open Assessment Module
 """
 
-__version__ = '6.5.2'
+__version__ = '6.6.1'
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,6 +8,10 @@ appdirs==1.4.4
     # via fs
 asgiref==3.8.1
     # via django
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 bleach==6.1.0
     # via -r requirements/base.in
 boto3==1.34.72
@@ -30,7 +34,7 @@ code-annotations==1.7.0
     # via edx-toggles
 defusedxml==0.7.1
     # via -r requirements/base.in
-django==3.2.25
+django==4.2.11
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -148,7 +152,6 @@ python-swiftclient==3.13.1
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   django
     #   djangorestframework
     #   edx-submissions
     #   fs

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -1,7 +1,7 @@
 # Version constraints for pip-installation.
 
 # Base dependencies
-Django<4.0                      # Stay on the latest LTS release of Django
+Django<4.3                         # Stay on the latest LTS release of Django
 fs<=2.0.18                         # Constrained by edx-platform
 loremipsum<2.0.0
 
@@ -14,11 +14,10 @@ idna<2.9.0                          # moto version moto==1.3.14 requires idna<2.
 fs-s3fs==0.1.8                      # Constrained by edx-platform
 wrapt==1.11.*                       # Constrained by astroid
 freezegun<=0.3.14                   # Test failures on 0.3.15
-# Moto 1.3.15 have build issues
-moto<1.3.15
 # Networkx 2.5 drops support for python 3.5
 networkx<2.5
-
+# Moto latest version has breaking changes. Needs the tests to be fixed.
+moto<5.0
 # path 13.2.0 drops support for Python 3.5
 path<13.2.0
 
@@ -33,3 +32,6 @@ setuptools<60.0
 django-simple-history<=3.1.1
 
 lxml<5.0.0  # xblock-sdk
+
+# backports.zoneinfo is only needed for Python < 3.9
+backports.zoneinfo; python_version<'3.9'
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-build==1.1.1
+build==1.2.1
     # via pip-tools
 click==8.1.7
     # via pip-tools