Merge branch 'main' into bmtcril/relicense_apache2

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [quality, docs, pii_check, django32, django40]
+        python-version: ['3.8', '3.11']
+        toxenv: [quality, docs, pii_check, django42]
     permissions:
       # Gives the action the necessary permissions for publishing new
       # comments in pull requests.
@@ -45,7 +45,7 @@ jobs:
       run: tox
 
     - name: Run coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
       uses: py-cov-action/python-coverage-comment-action@v3
       with:
         GITHUB_TOKEN: ${{ github.token }}

requirements/base.txt

@@ -12,15 +12,16 @@ asgiref==3.8.1
     # via django
 async-timeout==4.0.3
     # via redis
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   celery
     #   django
     #   djangorestframework
     #   kombu
 billiard==4.2.0
     # via celery
-celery==5.3.6
+celery==5.4.0
     # via -r requirements/base.in
 certifi==2024.2.2
     # via requests
@@ -90,7 +91,7 @@ markupsafe==2.1.5
     #   jinja2
     #   mako
     #   xblock
-newrelic==9.8.0
+newrelic==9.9.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via requests-oauthlib
@@ -173,7 +174,7 @@ web-fragments==2.2.0
     #   xblock
 webob==1.8.7
     # via xblock
-xblock==3.1.0
+xblock==4.0.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -24,7 +24,7 @@ platformdirs==4.2.0
     # via
     #   tox
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via tox
 pyproject-api==1.6.1
     # via tox
@@ -34,5 +34,5 @@ tomli==2.0.1
     #   tox
 tox==4.14.2
     # via -r requirements/ci.in
-virtualenv==20.25.1
+virtualenv==20.25.3
     # via tox

requirements/constraints.txt

@@ -10,3 +10,5 @@
 
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+
+backports.zoneinfo;python_version<"3.9"

requirements/dev.txt

@@ -25,8 +25,9 @@ async-timeout==4.0.3
     # via
     #   -r requirements/quality.txt
     #   redis
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/quality.txt
     #   celery
     #   django
@@ -48,7 +49,7 @@ cachetools==5.3.3
     # via
     #   -r requirements/ci.txt
     #   tox
-celery==5.3.6
+celery==5.4.0
     # via -r requirements/quality.txt
 certifi==2024.2.2
     # via
@@ -163,7 +164,7 @@ edx-opaque-keys==2.5.1
     # via -r requirements/quality.txt
 edx-toggles==5.2.0
     # via -r requirements/quality.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via
     #   -r requirements/quality.txt
     #   pytest
@@ -221,15 +222,15 @@ mccabe==0.7.0
     # via
     #   -r requirements/quality.txt
     #   pylint
-model-bakery==1.17.0
+model-bakery==1.18.0
     # via
     #   -r requirements/quality.txt
     #   django-mock-queries
 mypy-extensions==1.0.0
     # via
     #   -r requirements/quality.txt
     #   black
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
@@ -271,7 +272,7 @@ platformdirs==4.2.0
     #   pylint
     #   tox
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
@@ -454,7 +455,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.25.1
+virtualenv==20.25.3
     # via
     #   -r requirements/ci.txt
     #   tox
@@ -474,7 +475,7 @@ wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-xblock==3.1.0
+xblock==4.0.0
     # via -r requirements/quality.txt
 zipp==3.18.1
     # via

requirements/doc.txt

@@ -28,10 +28,11 @@ babel==2.14.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
-backports-tarfile==1.0.0
+backports-tarfile==1.1.0
     # via jaraco-context
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   celery
     #   django
@@ -45,7 +46,7 @@ billiard==4.2.0
     #   celery
 build==1.2.1
     # via -r requirements/doc.in
-celery==5.3.6
+celery==5.4.0
     # via -r requirements/test.txt
 certifi==2024.2.2
     # via
@@ -54,7 +55,6 @@ certifi==2024.2.2
 cffi==1.16.0
     # via
     #   -r requirements/test.txt
-    #   cryptography
     #   pynacl
 charset-normalizer==3.3.2
     # via
@@ -89,8 +89,6 @@ coverage[toml]==7.4.4
     # via
     #   -r requirements/test.txt
     #   pytest-cov
-cryptography==42.0.5
-    # via secretstorage
 ddt==1.7.2
     # via -r requirements/test.txt
 django==4.2.11
@@ -138,7 +136,7 @@ edx-opaque-keys==2.5.1
     # via -r requirements/test.txt
 edx-toggles==5.2.0
     # via -r requirements/test.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via
     #   -r requirements/test.txt
     #   pytest
@@ -169,12 +167,8 @@ jaraco-classes==3.4.0
     # via keyring
 jaraco-context==5.3.0
     # via keyring
-jaraco-functools==4.0.0
+jaraco-functools==4.0.1
     # via keyring
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.3
     # via
     #   -r requirements/test.txt
@@ -204,15 +198,15 @@ markupsafe==2.1.5
     #   xblock
 mdurl==0.1.2
     # via markdown-it-py
-model-bakery==1.17.0
+model-bakery==1.18.0
     # via
     #   -r requirements/test.txt
     #   django-mock-queries
 more-itertools==10.2.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -239,7 +233,7 @@ pbr==6.0.0
     #   stevedore
 pkginfo==1.10.0
     # via twine
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   -r requirements/test.txt
     #   pytest
@@ -332,8 +326,6 @@ rfc3986==2.0.0
     # via twine
 rich==13.7.1
     # via twine
-secretstorage==3.3.3
-    # via keyring
 simplejson==3.19.2
     # via
     #   -r requirements/test.txt
@@ -430,7 +422,7 @@ webob==1.8.7
     # via
     #   -r requirements/test.txt
     #   xblock
-xblock==3.1.0
+xblock==4.0.0
     # via -r requirements/test.txt
 zipp==3.18.1
     # via

requirements/quality.txt

@@ -24,8 +24,9 @@ async-timeout==4.0.3
     # via
     #   -r requirements/test.txt
     #   redis
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   celery
     #   django
@@ -37,7 +38,7 @@ billiard==4.2.0
     #   celery
 black==24.4.0
     # via -r requirements/quality.in
-celery==5.3.6
+celery==5.4.0
     # via -r requirements/test.txt
 certifi==2024.2.2
     # via
@@ -128,7 +129,7 @@ edx-opaque-keys==2.5.1
     # via -r requirements/test.txt
 edx-toggles==5.2.0
     # via -r requirements/test.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via
     #   -r requirements/test.txt
     #   pytest
@@ -172,13 +173,13 @@ markupsafe==2.1.5
     #   xblock
 mccabe==0.7.0
     # via pylint
-model-bakery==1.17.0
+model-bakery==1.18.0
     # via
     #   -r requirements/test.txt
     #   django-mock-queries
 mypy-extensions==1.0.0
     # via black
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -205,7 +206,7 @@ platformdirs==4.2.0
     # via
     #   black
     #   pylint
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   -r requirements/test.txt
     #   pytest
@@ -364,7 +365,7 @@ webob==1.8.7
     # via
     #   -r requirements/test.txt
     #   xblock
-xblock==3.1.0
+xblock==4.0.0
     # via -r requirements/test.txt
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/test.txt

@@ -20,8 +20,9 @@ async-timeout==4.0.3
     # via
     #   -r requirements/base.txt
     #   redis
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   celery
     #   django
@@ -31,7 +32,7 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-celery==5.3.6
+celery==5.4.0
     # via -r requirements/base.txt
 certifi==2024.2.2
     # via
@@ -110,7 +111,7 @@ edx-opaque-keys==2.5.1
     # via -r requirements/base.txt
 edx-toggles==5.2.0
     # via -r requirements/base.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via pytest
 fs==2.4.16
     # via
@@ -144,9 +145,9 @@ markupsafe==2.1.5
     #   jinja2
     #   mako
     #   xblock
-model-bakery==1.17.0
+model-bakery==1.18.0
     # via django-mock-queries
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
@@ -164,7 +165,7 @@ pbr==6.0.0
     # via
     #   -r requirements/base.txt
     #   stevedore
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 prompt-toolkit==3.0.43
     # via
@@ -291,7 +292,7 @@ webob==1.8.7
     # via
     #   -r requirements/base.txt
     #   xblock
-xblock==3.1.0
+xblock==4.0.0
     # via -r requirements/base.txt
 
 # The following packages are considered to be unsafe in a requirements file:

setup.py

@@ -167,12 +167,13 @@ def is_requirement(line):
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.11",
     ],
     entry_points={
         "lms.djangoapp": [