From fbdd80d68745081099a497b557998afc1692cac6 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 21 Apr 2024 20:17:12 -0400 Subject: [PATCH 1/5] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/ci.txt | 4 ++-- requirements/dev.txt | 14 +++++++------- requirements/doc.txt | 16 ++++++++-------- requirements/quality.txt | 12 ++++++------ requirements/test.txt | 12 ++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 267b174..b6aa5e7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -20,7 +20,7 @@ backports-zoneinfo[tzdata]==0.2.1 # 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 +90,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 +173,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: diff --git a/requirements/ci.txt b/requirements/ci.txt index 641296f..6f05147 100644 --- a/requirements/ci.txt +++ b/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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 7531af6..1528885 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -48,7 +48,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 +163,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,7 +221,7 @@ 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 @@ -229,7 +229,7 @@ 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 +271,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 +454,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.1 +virtualenv==20.25.3 # via # -r requirements/ci.txt # tox @@ -474,7 +474,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 diff --git a/requirements/doc.txt b/requirements/doc.txt index 3ded8ec..b4b6a8d 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -28,7 +28,7 @@ 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 # via @@ -45,7 +45,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 @@ -138,7 +138,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,7 +169,7 @@ 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 @@ -204,7 +204,7 @@ 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 @@ -212,7 +212,7 @@ 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 +239,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 @@ -430,7 +430,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 diff --git a/requirements/quality.txt b/requirements/quality.txt index 958559c..e2207cf 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -37,7 +37,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 +128,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 +172,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 +205,7 @@ platformdirs==4.2.0 # via # black # pylint -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/test.txt # pytest @@ -364,7 +364,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: diff --git a/requirements/test.txt b/requirements/test.txt index fd4e20e..a5937b1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -31,7 +31,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 +110,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 +144,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 +164,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 +291,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: From 519e6f87874e3d7d559dfe6f04790737de59dd44 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 22 Apr 2024 08:57:34 -0400 Subject: [PATCH 2/5] chore: Test on Django 4.2, Python 3.11. Drop Django 3.2, 4.0. --- .github/workflows/ci.yml | 6 +++--- setup.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec228f0..27e54dc 100644 --- a/.github/workflows/ci.yml +++ b/.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 }} diff --git a/setup.py b/setup.py index 9f99e4f..983fc1c 100755 --- a/setup.py +++ b/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": [ From 282bc3bb40969849d33538914b003f5d21f68f53 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 22 Apr 2024 08:59:51 -0400 Subject: [PATCH 3/5] chore: Test on Django 4.2, Python 3.11. Drop Django 3.2, 4.0. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c02f993..68f803c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40} +envlist = py{38,311}-django{42} [doc8] ; D001 = Line too long From 7f0942eac28aabd63dca7fbc3e3c03cf266f71fe Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 22 Apr 2024 09:00:30 -0400 Subject: [PATCH 4/5] chore: Test on Django 4.2, Python 3.11. Drop Django 3.2, 4.0. --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 68f803c..abf1cf8 100644 --- a/tox.ini +++ b/tox.ini @@ -38,8 +38,7 @@ norecursedirs = .* docs requirements site-packages setenv: DJANGO_SETTINGS_MODULE = test_settings deps = - django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt commands = python manage.py check From c8346506849e4245cd499d669bd13ad017bbee8d Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 22 Apr 2024 09:24:18 -0400 Subject: [PATCH 5/5] chore: Py3.11 compatibility in requirements --- requirements/base.txt | 3 ++- requirements/constraints.txt | 2 ++ requirements/dev.txt | 3 ++- requirements/doc.txt | 12 ++---------- requirements/quality.txt | 3 ++- requirements/test.txt | 3 ++- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b6aa5e7..c3908cd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,8 +12,9 @@ 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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d91704b..907dea2 100644 --- a/requirements/constraints.txt +++ b/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" diff --git a/requirements/dev.txt b/requirements/dev.txt index 1528885..4d5843a 100644 --- a/requirements/dev.txt +++ b/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 diff --git a/requirements/doc.txt b/requirements/doc.txt index b4b6a8d..e27b1ff 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,8 +30,9 @@ babel==2.14.0 # sphinx 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 @@ -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 @@ -171,10 +169,6 @@ jaraco-context==5.3.0 # via keyring jaraco-functools==4.0.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/test.txt @@ -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 diff --git a/requirements/quality.txt b/requirements/quality.txt index e2207cf..52c94d2 100644 --- a/requirements/quality.txt +++ b/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 diff --git a/requirements/test.txt b/requirements/test.txt index a5937b1..ed16bb4 100644 --- a/requirements/test.txt +++ b/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