From 0d3dae9b03a85812ac55a953c5502f1b7ed8c037 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Fri, 29 Mar 2024 15:02:43 +0500 Subject: [PATCH 1/2] feat: add python 311 support --- .github/workflows/ci.yml | 6 +- CHANGELOG.rst | 5 + requirements/ci.txt | 10 +- requirements/constraints.txt | 7 +- requirements/dev.txt | 180 ++++++++++++++++++++++------------- requirements/doc.txt | 180 ++++++++++++++++++++++------------- requirements/pip-tools.txt | 11 +-- requirements/pip.txt | 4 +- requirements/test.txt | 132 +++++++++++++++---------- setup.py | 4 +- taxonomy/__init__.py | 2 +- tox.ini | 5 +- 12 files changed, 335 insertions(+), 211 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d24cb8d4..ee62765f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [quality, docs, pii-annotations, django32, django40] + python-version: ['3.8', '3.11'] + toxenv: [quality, docs, pii-annotations, django42] steps: - uses: actions/checkout@v2 @@ -36,7 +36,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: codecov/codecov-action@v3 with: flags: unittests diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0eb6b807..d96c6a0a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,11 @@ Change Log Unreleased +[1.51.0] - 2024-03-29 +--------------------- +* feat: Added support for Python 3.11 +* feat!: Dropped support for Django 3.2, Django 4.0 and Django 4.1 + [1.50.0] - 2024-03-27 --------------------- * feat: Skill validation can be disbaled for a course or an organization diff --git a/requirements/ci.txt b/requirements/ci.txt index 25b2a935..fde81f38 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,15 +6,15 @@ # distlib==0.3.8 # via virtualenv -filelock==3.13.1 +filelock==3.15.3 # via # tox # virtualenv -packaging==24.0 +packaging==24.1 # via tox -platformdirs==4.2.0 +platformdirs==4.2.2 # via virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox py==1.11.0 # via tox @@ -26,5 +26,5 @@ tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/ci.in -virtualenv==20.25.1 +virtualenv==20.26.2 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 105c7b5c..8b9e8259 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,12 +9,10 @@ # linking to it here is good. # Stay on an LTS release -django<4.0 +django<4.3 path==13.1.0 -celery<5.0 - # latest version causing issues in discovery. algoliasearch-django<4.0.0 algoliasearch<2.0.0 @@ -28,3 +26,6 @@ sphinxcontrib-devhelp<=1.0.2 sphinxcontrib-htmlhelp<=2.0.1 sphinxcontrib-qthelp<=1.0.3 sphinxcontrib-serializinghtml<=1.1.5 + +# For python greater than or equal to 3.9 backports.zoneinfo causing failures +backports.zoneinfo; python_version<'3.9' diff --git a/requirements/dev.txt b/requirements/dev.txt index 7888c4ec..aa024d4c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,24 +8,24 @@ algoliasearch==1.20.0 # via # -c requirements/constraints.txt # -r requirements/test.txt -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/test.txt # kombu -annotated-types==0.6.0 +annotated-types==0.7.0 # via # -r requirements/test.txt # pydantic -anyio==4.3.0 +anyio==4.4.0 # via # -r requirements/test.txt # httpx # openai -asgiref==3.8.0 +asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.1.0 +astroid==3.2.2 # via # pylint # pylint-celery @@ -33,34 +33,36 @@ attrs==23.2.0 # via # -r requirements/test.txt # openedx-events -backports-zoneinfo==0.2.1 +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt + # celery + # django # djangorestframework + # kombu beautifulsoup4==4.12.3 # via -r requirements/test.txt -billiard==3.6.4.0 +billiard==4.2.0 # via # -r requirements/test.txt # celery -boto3==1.34.67 +boto3==1.34.131 # via # -r requirements/test.txt # django-ses -botocore==1.34.67 +botocore==1.34.131 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.1.1 +build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools -celery==4.4.7 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt -certifi==2024.2.2 +celery==5.4.0 + # via -r requirements/test.txt +certifi==2024.6.2 # via # -r requirements/test.txt # httpcore @@ -80,24 +82,40 @@ click==8.1.7 # via # -r requirements/pip-tools.txt # -r requirements/test.txt + # celery + # click-didyoumean # click-log + # click-plugins + # click-repl # code-annotations # edx-django-utils # edx-lint # pip-tools +click-didyoumean==0.3.1 + # via + # -r requirements/test.txt + # celery click-log==0.4.0 # via edx-lint -code-annotations==1.7.0 +click-plugins==1.1.1 + # via + # -r requirements/test.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/test.txt + # celery +code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint -coverage[toml]==7.4.4 +coverage[toml]==7.5.3 # via # -r requirements/test.txt # pytest-cov ddt==1.7.2 # via -r requirements/test.txt -diff-cover==8.0.3 +diff-cover==9.0.0 # via -r requirements/dev.in dill==0.3.8 # via pylint @@ -109,7 +127,7 @@ distro==1.9.0 # via # -r requirements/test.txt # openai -django==3.2.25 +django==4.2.13 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -130,13 +148,13 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/test.txt -django-model-utils==4.4.0 +django-model-utils==4.5.1 # via -r requirements/test.txt django-object-actions==4.2.0 # via -r requirements/test.txt -django-ses==3.5.2 +django-ses==4.1.0 # via -r requirements/test.txt django-solo==2.2.0 # via -r requirements/test.txt @@ -144,31 +162,40 @@ django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -djangorestframework==3.15.0 +djangorestframework==3.15.2 # via -r requirements/test.txt -edx-django-utils==5.11.0 +dnspython==2.6.1 + # via + # -r requirements/test.txt + # pymongo +edx-ccx-keys==1.3.0 + # via + # -r requirements/test.txt + # openedx-events +edx-django-utils==5.14.2 # via # -r requirements/test.txt # edx-rest-api-client # openedx-events -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.6.0 # via -r requirements/dev.in edx-lint==5.3.6 # via -r requirements/dev.in -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/test.txt + # edx-ccx-keys # openedx-events -edx-rest-api-client==5.6.1 +edx-rest-api-client==5.7.0 # via -r requirements/test.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # -r requirements/test.txt # anyio # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==24.3.0 +faker==25.9.1 # via # -r requirements/test.txt # factory-boy @@ -176,7 +203,7 @@ fastavro==1.9.4 # via # -r requirements/test.txt # openedx-events -filelock==3.13.1 +filelock==3.15.3 # via # -r requirements/ci.txt # tox @@ -185,7 +212,7 @@ h11==0.14.0 # via # -r requirements/test.txt # httpcore -httpcore==1.0.4 +httpcore==1.0.5 # via # -r requirements/test.txt # httpx @@ -193,13 +220,13 @@ httpx==0.27.0 # via # -r requirements/test.txt # openai -idna==3.6 +idna==3.7 # via # -r requirements/test.txt # anyio # httpx # requests -importlib-metadata==7.1.0 +importlib-metadata==7.2.0 # via # -r requirements/pip-tools.txt # build @@ -211,7 +238,7 @@ isort==5.13.2 # via # -r requirements/dev.in # pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/test.txt # code-annotations @@ -221,12 +248,16 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/test.txt # celery -lxml==5.1.0 - # via edx-i18n-tools +lxml[html-clean,html_clean]==5.2.2 + # via + # edx-i18n-tools + # lxml-html-clean +lxml-html-clean==0.1.1 + # via lxml markupsafe==2.1.5 # via # -r requirements/test.txt @@ -235,15 +266,15 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/test.txt -newrelic==9.7.1 +newrelic==9.11.0 # via # -r requirements/test.txt # edx-django-utils -openai==1.14.2 +openai==1.35.3 # via -r requirements/test.txt -openedx-events==9.5.2 +openedx-events==9.11.0 # via -r requirements/test.txt -packaging==24.0 +packaging==24.1 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -261,12 +292,12 @@ pbr==6.0.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.0 +platformdirs==4.2.2 # via # -r requirements/ci.txt # pylint # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -275,7 +306,11 @@ pluggy==1.4.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==5.9.8 +prompt-toolkit==3.0.47 + # via + # -r requirements/test.txt + # click-repl +psutil==6.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -283,29 +318,29 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.11.1 +pycodestyle==2.12.0 # via -r requirements/dev.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi -pydantic==2.6.4 +pydantic==2.7.4 # via # -r requirements/test.txt # openai -pydantic-core==2.16.3 +pydantic-core==2.18.4 # via # -r requirements/test.txt # pydantic pydocstyle==6.3.0 # via -r requirements/dev.in -pygments==2.17.2 +pygments==2.18.0 # via diff-cover pyjwt==2.8.0 # via # -r requirements/test.txt # edx-rest-api-client -pylint==3.1.0 +pylint==3.2.3 # via # edx-lint # pylint-celery @@ -319,7 +354,7 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.7.3 # via # -r requirements/test.txt # edx-opaque-keys @@ -327,17 +362,17 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.1.1 +pytest==8.2.2 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt @@ -345,6 +380,7 @@ python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # botocore + # celery # faker python-slugify==8.0.4 # via @@ -353,8 +389,6 @@ python-slugify==8.0.4 pytz==2024.1 # via # -r requirements/test.txt - # celery - # django # django-ses pyyaml==6.0.1 # via @@ -369,7 +403,7 @@ requests==2.31.0 # edx-rest-api-client # responses # slumber -responses==0.25.0 +responses==0.25.3 # via -r requirements/test.txt s3transfer==0.10.1 # via @@ -379,6 +413,7 @@ six==1.16.0 # via # -r requirements/ci.txt # -r requirements/test.txt + # edx-ccx-keys # edx-lint # python-dateutil # tox @@ -398,7 +433,7 @@ soupsieve==2.5 # via # -r requirements/test.txt # beautifulsoup4 -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/test.txt # django @@ -408,7 +443,7 @@ stevedore==5.2.0 # code-annotations # edx-django-utils # edx-opaque-keys -testfixtures==8.1.0 +testfixtures==8.3.0 # via -r requirements/test.txt text-unidecode==1.3 # via @@ -423,20 +458,19 @@ tomli==2.0.1 # coverage # pip-tools # pylint - # pyproject-hooks # pytest # tox -tomlkit==0.12.4 +tomlkit==0.12.5 # via pylint tox==3.28.0 # via # -c requirements/constraints.txt # -r requirements/ci.txt -tqdm==4.66.2 +tqdm==4.66.4 # via # -r requirements/test.txt # openai -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -r requirements/test.txt # annotated-types @@ -444,31 +478,41 @@ typing-extensions==4.10.0 # asgiref # astroid # edx-opaque-keys - # faker + # kombu # openai # pydantic # pydantic-core # pylint -urllib3==1.26.18 +tzdata==2024.1 + # via + # -r requirements/test.txt + # backports-zoneinfo + # celery +urllib3==1.26.19 # via # -r requirements/test.txt # botocore # requests # responses -vine==1.3.0 +vine==5.1.0 # via # -r requirements/test.txt # amqp # celery -virtualenv==20.25.1 + # kombu +virtualenv==20.26.2 # via # -r requirements/ci.txt # tox +wcwidth==0.2.13 + # via + # -r requirements/test.txt + # prompt-toolkit wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.18.1 +zipp==3.19.2 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 3e84ce7c..734405d0 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,20 +12,20 @@ algoliasearch==1.20.0 # via # -c requirements/constraints.txt # -r requirements/test.txt -amqp==2.6.1 +amqp==5.2.0 # via # -r requirements/test.txt # kombu -annotated-types==0.6.0 +annotated-types==0.7.0 # via # -r requirements/test.txt # pydantic -anyio==4.3.0 +anyio==4.4.0 # via # -r requirements/test.txt # httpx # openai -asgiref==3.8.0 +asgiref==3.8.1 # via # -r requirements/test.txt # django @@ -33,38 +33,42 @@ attrs==23.2.0 # via # -r requirements/test.txt # openedx-events -babel==2.14.0 +babel==2.15.0 # via # pydata-sphinx-theme # sphinx -backports-zoneinfo==0.2.1 +backports-tarfile==1.2.0 + # via jaraco-context +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/test.txt + # celery + # django # djangorestframework + # kombu beautifulsoup4==4.12.3 # via # -r requirements/test.txt # pydata-sphinx-theme -billiard==3.6.4.0 +billiard==4.2.0 # via # -r requirements/test.txt # celery -boto3==1.34.67 +boto3==1.34.131 # via # -r requirements/test.txt # django-ses -botocore==1.34.67 +botocore==1.34.131 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.1.1 +build==1.2.1 # via -r requirements/doc.in -celery==4.4.7 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt -certifi==2024.2.2 +celery==5.4.0 + # via -r requirements/test.txt +certifi==2024.6.2 # via # -r requirements/test.txt # httpcore @@ -81,11 +85,27 @@ charset-normalizer==3.3.2 click==8.1.7 # via # -r requirements/test.txt + # celery + # click-didyoumean + # click-plugins + # click-repl # code-annotations # edx-django-utils -code-annotations==1.7.0 +click-didyoumean==0.3.1 + # via + # -r requirements/test.txt + # celery +click-plugins==1.1.1 + # via + # -r requirements/test.txt + # celery +click-repl==0.3.0 + # via + # -r requirements/test.txt + # celery +code-annotations==1.8.0 # via -r requirements/test.txt -coverage[toml]==7.4.4 +coverage[toml]==7.5.3 # via # -r requirements/test.txt # pytest-cov @@ -95,7 +115,7 @@ distro==1.9.0 # via # -r requirements/test.txt # openai -django==3.2.25 +django==4.2.13 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -115,13 +135,13 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/test.txt -django-model-utils==4.4.0 +django-model-utils==4.5.1 # via -r requirements/test.txt django-object-actions==4.2.0 # via -r requirements/test.txt -django-ses==3.5.2 +django-ses==4.1.0 # via -r requirements/test.txt django-solo==2.2.0 # via -r requirements/test.txt @@ -129,8 +149,12 @@ django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -djangorestframework==3.15.0 +djangorestframework==3.15.2 # via -r requirements/test.txt +dnspython==2.6.1 + # via + # -r requirements/test.txt + # pymongo doc8==1.1.1 # via -r requirements/doc.in docutils==0.19 @@ -140,25 +164,30 @@ docutils==0.19 # readme-renderer # restructuredtext-lint # sphinx -edx-django-utils==5.11.0 +edx-ccx-keys==1.3.0 + # via + # -r requirements/test.txt + # openedx-events +edx-django-utils==5.14.2 # via # -r requirements/test.txt # edx-rest-api-client # openedx-events -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/test.txt + # edx-ccx-keys # openedx-events -edx-rest-api-client==5.6.1 +edx-rest-api-client==5.7.0 # via -r requirements/test.txt -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # -r requirements/test.txt # anyio # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==24.3.0 +faker==25.9.1 # via # -r requirements/test.txt # factory-boy @@ -170,7 +199,7 @@ h11==0.14.0 # via # -r requirements/test.txt # httpcore -httpcore==1.0.4 +httpcore==1.0.5 # via # -r requirements/test.txt # httpx @@ -178,7 +207,7 @@ httpx==0.27.0 # via # -r requirements/test.txt # openai -idna==3.6 +idna==3.7 # via # -r requirements/test.txt # anyio @@ -186,21 +215,25 @@ idna==3.6 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.1.0 +importlib-metadata==7.2.0 # via # build # keyring # sphinx # twine -importlib-resources==6.3.2 +importlib-resources==6.4.0 # via keyring iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -jaraco-classes==3.3.1 +jaraco-classes==3.4.0 + # via keyring +jaraco-context==5.3.0 + # via keyring +jaraco-functools==4.0.1 # via keyring -jinja2==3.1.3 +jinja2==3.1.4 # via # -r requirements/test.txt # code-annotations @@ -210,9 +243,9 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -keyring==24.3.1 +keyring==25.2.1 # via twine -kombu==4.6.11 +kombu==5.3.7 # via # -r requirements/test.txt # celery @@ -226,19 +259,21 @@ mdurl==0.1.2 # via markdown-it-py mock==5.1.0 # via -r requirements/test.txt -more-itertools==10.2.0 - # via jaraco-classes -newrelic==9.7.1 +more-itertools==10.3.0 + # via + # jaraco-classes + # jaraco-functools +newrelic==9.11.0 # via # -r requirements/test.txt # edx-django-utils -nh3==0.2.15 +nh3==0.2.17 # via readme-renderer -openai==1.14.2 +openai==1.35.3 # via -r requirements/test.txt -openedx-events==9.5.2 +openedx-events==9.11.0 # via -r requirements/test.txt -packaging==24.0 +packaging==24.1 # via # -r requirements/test.txt # build @@ -249,31 +284,35 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkginfo==1.10.0 +pkginfo==1.11.1 # via twine -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/test.txt # pytest -psutil==5.9.8 +prompt-toolkit==3.0.47 + # via + # -r requirements/test.txt + # click-repl +psutil==6.0.0 # via # -r requirements/test.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi -pydantic==2.6.4 +pydantic==2.7.4 # via # -r requirements/test.txt # openai -pydantic-core==2.16.3 +pydantic-core==2.18.4 # via # -r requirements/test.txt # pydantic pydata-sphinx-theme==0.14.4 # via sphinx-book-theme -pygments==2.17.2 +pygments==2.18.0 # via # accessible-pygments # doc8 @@ -285,7 +324,7 @@ pyjwt==2.8.0 # via # -r requirements/test.txt # edx-rest-api-client -pymongo==3.13.0 +pymongo==4.7.3 # via # -r requirements/test.txt # edx-opaque-keys @@ -293,14 +332,14 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via build -pytest==8.1.1 +pytest==8.2.2 # via # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.txt pytest-django==4.8.0 # via -r requirements/test.txt @@ -308,6 +347,7 @@ python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # botocore + # celery # faker python-slugify==8.0.4 # via @@ -317,8 +357,6 @@ pytz==2024.1 # via # -r requirements/test.txt # babel - # celery - # django # django-ses pyyaml==6.0.1 # via @@ -339,7 +377,7 @@ requests==2.31.0 # twine requests-toolbelt==1.0.0 # via twine -responses==0.25.0 +responses==0.25.3 # via -r requirements/test.txt restructuredtext-lint==1.4.0 # via doc8 @@ -354,6 +392,7 @@ s3transfer==0.10.1 six==1.16.0 # via # -r requirements/test.txt + # edx-ccx-keys # python-dateutil slumber==0.7.1 # via @@ -400,7 +439,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via # -c requirements/constraints.txt # sphinx -sqlparse==0.4.4 +sqlparse==0.5.0 # via # -r requirements/test.txt # django @@ -411,7 +450,7 @@ stevedore==5.2.0 # doc8 # edx-django-utils # edx-opaque-keys -testfixtures==8.1.0 +testfixtures==8.3.0 # via -r requirements/test.txt text-unidecode==1.3 # via @@ -423,40 +462,49 @@ tomli==2.0.1 # build # coverage # doc8 - # pyproject-hooks # pytest -tqdm==4.66.2 +tqdm==4.66.4 # via # -r requirements/test.txt # openai -twine==5.0.0 +twine==5.1.0 # via -r requirements/doc.in -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -r requirements/test.txt # annotated-types # anyio # asgiref # edx-opaque-keys - # faker + # kombu # openai # pydantic # pydantic-core # pydata-sphinx-theme # rich -urllib3==1.26.18 +tzdata==2024.1 + # via + # -r requirements/test.txt + # backports-zoneinfo + # celery +urllib3==1.26.19 # via # -r requirements/test.txt # botocore # requests # responses # twine -vine==1.3.0 +vine==5.1.0 # via # -r requirements/test.txt # amqp # celery -zipp==3.18.1 + # kombu +wcwidth==0.2.13 + # via + # -r requirements/test.txt + # prompt-toolkit +zipp==3.19.2 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 8931dc2e..8b59100b 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,17 +4,17 @@ # # make upgrade # -build==1.1.1 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.1.0 +importlib-metadata==7.2.0 # via build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools @@ -22,10 +22,9 @@ tomli==2.0.1 # via # build # pip-tools - # pyproject-hooks wheel==0.43.0 # via pip-tools -zipp==3.18.1 +zipp==3.19.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index cf449024..c9a36e3e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.1 # via -r requirements/pip.in -setuptools==69.2.0 +setuptools==70.1.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 63431924..2cf1fcbe 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,35 +8,38 @@ algoliasearch==1.20.0 # via # -c requirements/constraints.txt # -r requirements/base.in -amqp==2.6.1 +amqp==5.2.0 # via kombu -annotated-types==0.6.0 +annotated-types==0.7.0 # via pydantic -anyio==4.3.0 +anyio==4.4.0 # via # httpx # openai -asgiref==3.8.0 +asgiref==3.8.1 # via django attrs==23.2.0 # via openedx-events -backports-zoneinfo==0.2.1 - # via djangorestframework +backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # celery + # django + # djangorestframework + # kombu beautifulsoup4==4.12.3 # via -r requirements/base.in -billiard==3.6.4.0 +billiard==4.2.0 # via celery -boto3==1.34.67 +boto3==1.34.131 # via django-ses -botocore==1.34.67 +botocore==1.34.131 # via # boto3 # s3transfer -celery==4.4.7 - # via - # -c requirements/constraints.txt - # -r requirements/base.in -certifi==2024.2.2 +celery==5.4.0 + # via -r requirements/base.in +certifi==2024.6.2 # via # httpcore # httpx @@ -47,11 +50,21 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via + # celery + # click-didyoumean + # click-plugins + # click-repl # code-annotations # edx-django-utils -code-annotations==1.7.0 +click-didyoumean==0.3.1 + # via celery +click-plugins==1.1.1 + # via celery +click-repl==0.3.0 + # via celery +code-annotations==1.8.0 # via -r requirements/test.in -coverage[toml]==7.4.4 +coverage[toml]==7.5.3 # via pytest-cov ddt==1.7.2 # via -r requirements/test.in @@ -74,38 +87,43 @@ django-choices==2.0.0 # via -r requirements/base.in django-crum==0.7.9 # via edx-django-utils -django-filter==23.5 +django-filter==24.2 # via -r requirements/base.in -django-model-utils==4.4.0 +django-model-utils==4.5.1 # via -r requirements/base.in django-object-actions==4.2.0 # via -r requirements/base.in -django-ses==3.5.2 +django-ses==4.1.0 # via -r requirements/base.in django-solo==2.2.0 # via -r requirements/base.in django-waffle==4.1.0 # via edx-django-utils -djangorestframework==3.15.0 +djangorestframework==3.15.2 # via -r requirements/base.in -edx-django-utils==5.11.0 +dnspython==2.6.1 + # via pymongo +edx-ccx-keys==1.3.0 + # via openedx-events +edx-django-utils==5.14.2 # via # -r requirements/base.in # edx-rest-api-client # openedx-events -edx-opaque-keys[django]==2.5.1 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/base.in + # edx-ccx-keys # openedx-events -edx-rest-api-client==5.6.1 +edx-rest-api-client==5.7.0 # via -r requirements/base.in -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 # via # anyio # pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==24.3.0 +faker==25.9.1 # via # -r requirements/test.in # factory-boy @@ -113,74 +131,75 @@ fastavro==1.9.4 # via openedx-events h11==0.14.0 # via httpcore -httpcore==1.0.4 +httpcore==1.0.5 # via httpx httpx==0.27.0 # via openai -idna==3.6 +idna==3.7 # via # anyio # httpx # requests iniconfig==2.0.0 # via pytest -jinja2==3.1.3 +jinja2==3.1.4 # via code-annotations jmespath==1.0.1 # via # boto3 # botocore -kombu==4.6.11 +kombu==5.3.7 # via celery markupsafe==2.1.5 # via jinja2 mock==5.1.0 # via -r requirements/test.in -newrelic==9.7.1 +newrelic==9.11.0 # via edx-django-utils -openai==1.14.2 +openai==1.35.3 # via -r requirements/base.in -openedx-events==9.5.2 +openedx-events==9.11.0 # via -r requirements/base.in -packaging==24.0 +packaging==24.1 # via pytest pbr==6.0.0 # via stevedore -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -psutil==5.9.8 +prompt-toolkit==3.0.47 + # via click-repl +psutil==6.0.0 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi -pydantic==2.6.4 +pydantic==2.7.4 # via openai -pydantic-core==2.16.3 +pydantic-core==2.18.4 # via pydantic pyjwt==2.8.0 # via edx-rest-api-client -pymongo==3.13.0 +pymongo==4.7.3 # via edx-opaque-keys pynacl==1.5.0 # via edx-django-utils -pytest==8.1.1 +pytest==8.2.2 # via # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in pytest-django==4.8.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via # botocore + # celery # faker python-slugify==8.0.4 # via code-annotations pytz==2024.1 # via # -r requirements/base.in - # celery - # django # django-ses pyyaml==6.0.1 # via @@ -192,12 +211,14 @@ requests==2.31.0 # edx-rest-api-client # responses # slumber -responses==0.25.0 +responses==0.25.3 # via -r requirements/test.in s3transfer==0.10.1 # via boto3 six==1.16.0 - # via python-dateutil + # via + # edx-ccx-keys + # python-dateutil slumber==0.7.1 # via edx-rest-api-client sniffio==1.3.1 @@ -207,14 +228,14 @@ sniffio==1.3.1 # openai soupsieve==2.5 # via beautifulsoup4 -sqlparse==0.4.4 +sqlparse==0.5.0 # via django stevedore==5.2.0 # via # code-annotations # edx-django-utils # edx-opaque-keys -testfixtures==8.1.0 +testfixtures==8.3.0 # via -r requirements/test.in text-unidecode==1.3 # via python-slugify @@ -222,24 +243,31 @@ tomli==2.0.1 # via # coverage # pytest -tqdm==4.66.2 +tqdm==4.66.4 # via openai -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # annotated-types # anyio # asgiref # edx-opaque-keys - # faker + # kombu # openai # pydantic # pydantic-core -urllib3==1.26.18 +tzdata==2024.1 + # via + # backports-zoneinfo + # celery +urllib3==1.26.19 # via # botocore # requests # responses -vine==1.3.0 +vine==5.1.0 # via # amqp # celery + # kombu +wcwidth==0.2.13 + # via prompt-toolkit diff --git a/setup.py b/setup.py index c27e4f83..72c321e0 100644 --- a/setup.py +++ b/setup.py @@ -95,9 +95,9 @@ def get_requirements(requirements_file): install_requires=REQUIREMENTS, classifiers=[ 'Framework :: Django', - 'Framework :: Django :: 3.2', - 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.2', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', ], ) diff --git a/taxonomy/__init__.py b/taxonomy/__init__.py index 4d14b545..cca21f13 100644 --- a/taxonomy/__init__.py +++ b/taxonomy/__init__.py @@ -15,6 +15,6 @@ # 2. MINOR version when you add functionality in a backwards compatible manner, and # 3. PATCH version when you make backwards compatible bug fixes. # More details can be found at https://semver.org/ -__version__ = '1.50.0' +__version__ = '1.51.0' default_app_config = 'taxonomy.apps.TaxonomyConfig' # pylint: disable=invalid-name diff --git a/tox.ini b/tox.ini index 6177d9a7..ce7214a5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,40},quality,pii-annotations +envlist = py{38, 311}-django{42},quality,pii-annotations [pycodestyle] exclude = .git,.tox,migrations @@ -44,8 +44,7 @@ markers = [testenv] 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 = pytest {posargs} From 8c472f1d9b0d9060bb7312e002ce072118304eb1 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Fri, 21 Jun 2024 23:05:21 +0500 Subject: [PATCH 2/2] fix: fix xmlsec issue in migrations check --- .github/workflows/mysql8-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mysql8-migrations.yml b/.github/workflows/mysql8-migrations.yml index 479efe72..58b04ee1 100644 --- a/.github/workflows/mysql8-migrations.yml +++ b/.github/workflows/mysql8-migrations.yml @@ -52,7 +52,7 @@ jobs: pip uninstall -y mysqlclient pip install --no-binary mysqlclient mysqlclient pip uninstall -y xmlsec - pip install --no-binary xmlsec xmlsec + pip install --no-binary xmlsec xmlsec==1.3.13 - name: Initiate Services run: |