From ae7b7069519322fc7ccf9d3f604f1458b68ee51b Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 23 Feb 2024 07:37:35 -0500 Subject: [PATCH 1/4] feat: add python 3.12 support --- .github/workflows/ci.yml | 6 ++++-- tox.ini | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4305db1..c9abec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,10 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [quality, django32, django42] + python-version: + - '3.8' + - '3.12' + toxenv: [quality, django42] steps: - uses: actions/checkout@v4 diff --git a/tox.ini b/tox.ini index b11c876..1391627 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,10 @@ [tox] -envlist = django{32,42}, quality +envlist = django{42}, quality [testenv] allowlist_externals = make deps = - django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/ci.txt commands = From fed66927ede49841c46733ecfc1ca2d98cfdd20f Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Thu, 28 Mar 2024 14:11:06 +0500 Subject: [PATCH 2/4] feat: adding python3.11 support. --- .github/workflows/ci.yml | 2 +- setup.py | 2 +- staff_graded/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9abec7..743f215 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: os: [ubuntu-20.04] python-version: - '3.8' - - '3.12' + - '3.11' toxenv: [quality, django42] steps: diff --git a/setup.py b/setup.py index ab5e889..df57455 100644 --- a/setup.py +++ b/setup.py @@ -75,8 +75,8 @@ def get_version(file_path): 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', 'Framework :: Django', - 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.2', ], packages=[ diff --git a/staff_graded/__init__.py b/staff_graded/__init__.py index 2637900..ff3934e 100644 --- a/staff_graded/__init__.py +++ b/staff_graded/__init__.py @@ -2,4 +2,4 @@ from .staff_graded import StaffGradedXBlock -__version__ = '2.2.0' +__version__ = '2.3.0' From c2cc22adf40cba264ef124a8fdcb12d712999ad0 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Thu, 28 Mar 2024 14:49:58 +0500 Subject: [PATCH 3/4] feat: adding python3.11 support. --- requirements/constraints.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a51cb08..089eb3f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,6 @@ # Common constraints for edx repos -c common_constraints.txt + +# Temporary to Support the python 3.11 Upgrade +backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library \ No newline at end of file From dcc983d15e45f9c84d2ab06e596365a637ca75fd Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 28 Mar 2024 05:51:09 -0400 Subject: [PATCH 4/4] chore: Updating Python Requirements --- requirements/base.txt | 42 +++++++++--------- requirements/ci.txt | 10 ++--- requirements/common_constraints.txt | 11 ++++- requirements/dev.txt | 66 +++++++++++++++-------------- requirements/pip.txt | 4 +- requirements/pip_tools.txt | 16 ++++--- requirements/test.txt | 52 ++++++++++++----------- requirements/tox.txt | 10 ++--- 8 files changed, 114 insertions(+), 97 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4474817..124656e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,11 +8,14 @@ amqp==5.2.0 # via kombu appdirs==1.4.4 # via fs -asgiref==3.7.2 +asgiref==3.8.1 # via django -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 @@ -31,13 +34,13 @@ click==8.1.7 # click-plugins # click-repl # edx-django-utils -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # django-crum @@ -60,13 +63,13 @@ django-model-utils==4.4.0 # super-csv django-waffle==4.1.0 # via edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via super-csv edx-bulk-grades==1.0.2 # via -r requirements/base.in edx-celeryutils==1.2.5 # via super-csv -edx-django-utils==5.10.1 +edx-django-utils==5.11.0 # via super-csv edx-opaque-keys==2.5.1 # via edx-bulk-grades @@ -74,23 +77,25 @@ fs==2.4.16 # via xblock idna==3.6 # via requests -importlib-metadata==7.0.1 - # via markdown +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # markdown jsonfield==3.1.0 # via edx-celeryutils -kombu==5.3.5 +kombu==5.3.6 # via celery lxml==5.1.0 # via xblock mako==1.3.2 # via xblock -markdown==3.5.2 +markdown==3.6 # via -r requirements/base.in markupsafe==2.1.5 # via # mako # xblock -newrelic==9.6.0 +newrelic==9.8.0 # via edx-django-utils path==16.10.0 # via path-py @@ -108,15 +113,12 @@ pymongo==3.13.0 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # celery # xblock pytz==2024.1 - # via - # django - # djangorestframework - # xblock + # via xblock pyyaml==6.0.1 # via xblock requests==2.31.0 @@ -135,13 +137,13 @@ slumber==0.7.1 # via edx-bulk-grades sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via # edx-django-utils # edx-opaque-keys super-csv==3.1.0 # via edx-bulk-grades -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # asgiref # edx-opaque-keys @@ -165,9 +167,9 @@ web-fragments==2.1.0 # xblock webob==1.8.7 # via xblock -xblock==1.10.0 +xblock==3.0.0 # via -r requirements/base.in -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index 6d823ec..cc402fb 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/tox.txt # tox @@ -20,12 +20,12 @@ distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/tox.txt # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # -r requirements/tox.txt # pyproject-api @@ -50,9 +50,9 @@ tomli==2.0.1 # -r requirements/tox.txt # pyproject-api # tox -tox==4.13.0 +tox==4.14.2 # via -r requirements/tox.txt -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 15aafb2..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,7 +13,7 @@ # using LTS django version -Django<4.0 +Django<5.0 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html @@ -21,3 +21,12 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/dev.txt b/requirements/dev.txt index f0dfeaf..f4a12b2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,26 +12,29 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery -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 + # djangorestframework # kombu billiard==4.2.0 # via # -r requirements/base.txt # celery -build==1.0.3 +build==1.1.1 # via pip-tools -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/tox.txt # tox @@ -67,7 +70,7 @@ click==8.1.7 # edx-django-utils # edx-lint # pip-tools -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via # -r requirements/base.txt # celery @@ -81,13 +84,13 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint colorama==0.4.6 # via # -r requirements/tox.txt # tox -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via pytest-cov dill==0.3.8 # via pylint @@ -95,7 +98,7 @@ distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -130,7 +133,7 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # super-csv @@ -142,7 +145,7 @@ edx-celeryutils==1.2.5 # via # -r requirements/base.txt # super-csv -edx-django-utils==5.10.1 +edx-django-utils==5.11.0 # via # -r requirements/base.txt # super-csv @@ -156,7 +159,7 @@ edx-opaque-keys==2.5.1 # edx-bulk-grades exceptiongroup==1.2.0 # via pytest -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/tox.txt # tox @@ -169,8 +172,9 @@ idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/base.txt # build # markdown @@ -184,7 +188,7 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -kombu==5.3.5 +kombu==5.3.6 # via # -r requirements/base.txt # celery @@ -197,7 +201,7 @@ mako==1.3.2 # via # -r requirements/base.txt # xblock -markdown==3.5.2 +markdown==3.6 # via # -r requirements/base.in # -r requirements/base.txt @@ -209,11 +213,11 @@ markupsafe==2.1.5 # xblock mccabe==0.7.0 # via pylint -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via # -r requirements/tox.txt # build @@ -233,7 +237,7 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in platformdirs==4.2.0 # via @@ -260,7 +264,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pylint==3.0.3 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -290,11 +294,11 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -pytest==8.0.1 +pytest==8.1.1 # via pytest-cov -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # celery @@ -304,8 +308,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -338,7 +340,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -361,13 +363,13 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.12.3 +tomlkit==0.12.4 # via pylint -tox==4.13.0 +tox==4.14.2 # via # -r requirements/tox.in # -r requirements/tox.txt -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref @@ -390,7 +392,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox @@ -407,13 +409,13 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -xblock==1.10.0 +xblock==3.0.0 # via # -r requirements/base.in # -r requirements/base.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 71954cc..cf44902 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index fb84d10..3db2d4c 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,15 +4,17 @@ # # make upgrade # -build==1.0.3 +build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c requirements/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 # via @@ -23,9 +25,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 51a76c3..011ef71 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,18 +12,21 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery -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 + # djangorestframework # kombu billiard==4.2.0 # via @@ -56,7 +59,7 @@ click==8.1.7 # code-annotations # edx-django-utils # edx-lint -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via # -r requirements/base.txt # celery @@ -70,13 +73,13 @@ click-repl==0.3.0 # via # -r requirements/base.txt # celery -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via pytest-cov dill==0.3.8 # via pylint -django==3.2.24 +django==4.2.11 # via # -c requirements/common_constraints.txt # -r requirements/base.txt @@ -104,7 +107,7 @@ django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # super-csv @@ -114,7 +117,7 @@ edx-celeryutils==1.2.5 # via # -r requirements/base.txt # super-csv -edx-django-utils==5.10.1 +edx-django-utils==5.11.0 # via # -r requirements/base.txt # super-csv @@ -134,8 +137,9 @@ idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==7.0.1 +importlib-metadata==6.11.0 # via + # -c requirements/common_constraints.txt # -r requirements/base.txt # markdown iniconfig==2.0.0 @@ -148,7 +152,7 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils -kombu==5.3.5 +kombu==5.3.6 # via # -r requirements/base.txt # celery @@ -160,7 +164,7 @@ mako==1.3.2 # via # -r requirements/base.txt # xblock -markdown==3.5.2 +markdown==3.6 # via -r requirements/base.txt markupsafe==2.1.5 # via @@ -170,11 +174,11 @@ markupsafe==2.1.5 # xblock mccabe==0.7.0 # via pylint -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via pytest path==16.10.0 # via @@ -202,7 +206,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pylint==3.0.3 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -224,11 +228,11 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.0.1 +pytest==8.1.1 # via pytest-cov -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # celery @@ -238,8 +242,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/base.txt - # django - # djangorestframework # xblock pyyaml==6.0.1 # via @@ -270,7 +272,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # code-annotations @@ -287,9 +289,9 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.12.3 +tomlkit==0.12.4 # via pylint -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref @@ -324,9 +326,9 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -xblock==1.10.0 +xblock==3.0.0 # via -r requirements/base.txt -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/tox.txt b/requirements/tox.txt index 51576e8..cc5293d 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via tox chardet==5.2.0 # via tox @@ -12,11 +12,11 @@ colorama==0.4.6 # via tox distlib==0.3.8 # via virtualenv -filelock==3.13.1 +filelock==3.13.3 # via # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # pyproject-api # tox @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.13.0 +tox==4.14.2 # via -r requirements/tox.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox