diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a591a7d..38849bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ["3.8"] + python-version: ["3.11"] node-version: ["10"] toxenv: [django42, quality, pii_check, rst_validation] diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5629044..185d66f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,11 @@ Change Log Unreleased ~~~~~~~~~~ +[2.4.0] - 2024-04-23 +~~~~~~~~~~~~~~~~~~~~ +* Added python3.11 support. + + [2.3.6] - 2023-07-28 ~~~~~~~~~~~~~~~~~~~~ * Upgrade django-simple-history. Added new migration. Fixed packages upgrade issues. diff --git a/Makefile b/Makefile index 3c68c78..46881b1 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,6 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) - sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! # need to do this to remove django-simple-history from common constraint. @@ -53,16 +51,10 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in - $(PIP_COMPILE) -o requirements/celery53.txt requirements/celery53.in + $(PIP_COMPILE) -o requirements/celery54.txt requirements/celery54.in # Let tox control the Django version for tests sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp mv requirements/test.tmp requirements/test.txt - sed -i.tmp '/^amqp==/d' requirements/test.txt - sed -i.tmp '/^anyjson==/d' requirements/test.txt - sed -i.tmp '/^billiard==/d' requirements/test.txt - sed -i.tmp '/^celery==/d' requirements/test.txt - sed -i.tmp '/^kombu==/d' requirements/test.txt - sed -i.tmp '/^vine==/d' requirements/test.txt rm requirements/*.txt.tmp quality-python: ## Run python linters diff --git a/edx_name_affirmation/__init__.py b/edx_name_affirmation/__init__.py index 6ad71be..9e2a1bd 100644 --- a/edx_name_affirmation/__init__.py +++ b/edx_name_affirmation/__init__.py @@ -2,4 +2,4 @@ Django app housing name affirmation logic. """ -__version__ = '2.3.7' +__version__ = '2.4.0' diff --git a/requirements/base.txt b/requirements/base.txt index c793676..d0dd47f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,21 +8,15 @@ amqp==5.2.0 # via kombu asgiref==3.8.1 # via django -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via celery celery==5.4.0 # via # -c requirements/constraints.txt # edx-celeryutils -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -44,15 +38,16 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -cryptography==43.0.0 +cryptography==43.0.1 # via pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/base.in # django-config-models # django-crum # django-model-utils + # django-simple-history # django-waffle # djangorestframework # drf-jwt @@ -69,14 +64,12 @@ django-crum==0.7.9 # via # edx-django-utils # edx-toggles -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # -r requirements/base.in # edx-celeryutils -django-simple-history==3.1.1 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +django-simple-history==3.7.0 + # via -r requirements/base.in django-waffle==4.1.0 # via # edx-django-utils @@ -106,13 +99,13 @@ edx-django-utils==5.15.0 # django-config-models # edx-drf-extensions # edx-toggles -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via edx-drf-extensions edx-toggles==5.2.0 # via -r requirements/base.in -idna==3.7 +idna==3.8 # via requests inflection==0.5.1 # via drf-yasg @@ -128,7 +121,7 @@ newrelic==9.13.0 # via edx-django-utils packaging==24.1 # via drf-yasg -pbr==6.0.0 +pbr==6.1.0 # via stevedore prompt-toolkit==3.0.47 # via click-repl @@ -162,7 +155,7 @@ six==1.16.0 # via python-dateutil sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # edx-django-utils @@ -170,14 +163,9 @@ stevedore==5.2.0 text-unidecode==1.3 # via python-slugify typing-extensions==4.12.2 - # via - # asgiref - # edx-opaque-keys - # kombu + # via edx-opaque-keys tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery uritemplate==4.1.1 # via drf-yasg urllib3==2.2.2 diff --git a/requirements/celery53.in b/requirements/celery53.in deleted file mode 100644 index f971eab..0000000 --- a/requirements/celery53.in +++ /dev/null @@ -1 +0,0 @@ -celery>=5.0,<6.0 diff --git a/requirements/celery54.in b/requirements/celery54.in new file mode 100644 index 0000000..4a4c935 --- /dev/null +++ b/requirements/celery54.in @@ -0,0 +1 @@ +celery>=5.2.2,<5.5.0 diff --git a/requirements/celery53.txt b/requirements/celery54.txt similarity index 70% rename from requirements/celery53.txt rename to requirements/celery54.txt index 1d2d088..7c8d35a 100644 --- a/requirements/celery53.txt +++ b/requirements/celery54.txt @@ -1,19 +1,15 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # amqp==5.2.0 # via kombu -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # kombu billiard==4.2.0 # via celery celery==5.4.0 - # via -r requirements/celery53.in + # via -r requirements/celery54.in click==8.1.7 # via # celery @@ -34,12 +30,8 @@ python-dateutil==2.9.0.post0 # via celery six==1.16.0 # via python-dateutil -typing-extensions==4.12.2 - # via kombu tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery vine==5.1.0 # via # amqp diff --git a/requirements/ci.txt b/requirements/ci.txt index ed50b3a..833af19 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -30,10 +30,6 @@ pluggy==1.5.0 # via tox pyproject-api==1.7.1 # via tox -tomli==2.0.1 - # via - # pyproject-api - # tox tox==4.18.0 # via -r requirements/ci.in virtualenv==20.26.3 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index fc95227..a0237bc 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -1,4 +1,8 @@ + + + + # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/constraints.txt b/requirements/constraints.txt index bd700b5..9396cee 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -11,8 +11,9 @@ # Common constraints for edx repos -c common_constraints.txt -# pinning celery to latest release -celery<6.0 +# As it is not clarified what exact breaking changes will be introduced as per +# the next major release, ensure the installed version is within boundaries. +celery>=5.2.2,<6.0.0 -# incremental upgrade plan. -django-simple-history<=3.1.1 +# Temporary to Support the python 3.11 Upgrade +backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library diff --git a/requirements/dev.txt b/requirements/dev.txt index c9eb768..392992b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -21,10 +21,6 @@ backports-tarfile==1.2.0 # via # -r requirements/quality.txt # jaraco-context -backports-zoneinfo==0.2.1 - # via - # -r requirements/quality.txt - # django build==1.2.1 # via # -r requirements/pip-tools.txt @@ -33,14 +29,10 @@ cachetools==5.5.0 # via # -r requirements/ci.txt # tox -certifi==2024.7.4 +certifi==2024.8.30 # via # -r requirements/quality.txt # requests -cffi==1.17.0 - # via - # -r requirements/quality.txt - # cryptography chardet==5.2.0 # via # -r requirements/ci.txt @@ -73,10 +65,6 @@ colorama==0.4.6 # tox coverage==7.6.1 # via -r requirements/ci.txt -cryptography==43.0.0 - # via - # -r requirements/quality.txt - # secretstorage diff-cover==9.1.1 # via -r requirements/dev.in dill==0.3.8 @@ -87,41 +75,34 @@ distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==4.2.15 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/quality.txt # edx-i18n-tools -docutils==0.20.1 +docutils==0.21.2 # via # -r requirements/quality.txt # readme-renderer # rstcheck-core -edx-i18n-tools==1.6.2 +edx-i18n-tools==1.6.3 # via -r requirements/dev.in -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.txt filelock==3.15.4 # via # -r requirements/ci.txt # tox # virtualenv -idna==3.7 +idna==3.8 # via # -r requirements/quality.txt # requests -importlib-metadata==8.3.0 +importlib-metadata==8.4.0 # via - # -r requirements/pip-tools.txt # -r requirements/quality.txt - # build # keyring - # rstcheck-core # twine -importlib-resources==6.4.3 - # via - # -r requirements/quality.txt - # keyring isort==5.13.2 # via # -r requirements/quality.txt @@ -138,11 +119,6 @@ jaraco-functools==4.0.2 # via # -r requirements/quality.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==3.1.4 # via # -r requirements/quality.txt @@ -152,7 +128,7 @@ keyring==25.3.0 # via # -r requirements/quality.txt # twine -lxml==5.3.0 +lxml[html_clean]==5.3.0 # via edx-i18n-tools markdown-it-py==3.0.0 # via @@ -170,7 +146,7 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py -more-itertools==10.4.0 +more-itertools==10.5.0 # via # -r requirements/quality.txt # jaraco-classes @@ -188,7 +164,7 @@ packaging==24.1 # tox path==16.16.0 # via edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/quality.txt # stevedore @@ -214,15 +190,11 @@ polib==1.2.0 # via edx-i18n-tools pycodestyle==2.12.1 # via -r requirements/quality.txt -pycparser==2.22 - # via - # -r requirements/quality.txt - # cffi -pydantic==2.8.2 +pydantic==2.9.0 # via # -r requirements/quality.txt # rstcheck-core -pydantic-core==2.20.1 +pydantic-core==2.23.2 # via # -r requirements/quality.txt # pydantic @@ -234,7 +206,7 @@ pygments==2.18.0 # diff-cover # readme-renderer # rich -pylint==3.2.6 +pylint==3.2.7 # via # -r requirements/quality.txt # edx-lint @@ -272,7 +244,7 @@ pyyaml==6.0.2 # -r requirements/quality.txt # code-annotations # edx-i18n-tools -readme-renderer==43.0 +readme-renderer==44.0 # via # -r requirements/quality.txt # twine @@ -289,7 +261,7 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==13.7.1 +rich==13.8.0 # via # -r requirements/quality.txt # twine @@ -300,10 +272,6 @@ rstcheck-core==1.2.1 # via # -r requirements/quality.txt # rstcheck -secretstorage==3.3.3 - # via - # -r requirements/quality.txt - # keyring shellingham==1.5.4 # via # -r requirements/quality.txt @@ -320,7 +288,7 @@ sqlparse==0.5.1 # via # -r requirements/quality.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/quality.txt # code-annotations @@ -328,16 +296,6 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomli==2.0.1 - # via - # -r requirements/ci.txt - # -r requirements/pip-tools.txt - # -r requirements/quality.txt - # build - # pip-tools - # pylint - # pyproject-api - # tox tomlkit==0.13.2 # via # -r requirements/quality.txt @@ -346,22 +304,20 @@ tox==4.18.0 # via -r requirements/ci.txt twine==5.1.1 # via -r requirements/quality.txt -typer==0.12.4 +typer==0.12.5 # via # -r requirements/quality.txt # rstcheck typing-extensions==4.12.2 # via # -r requirements/quality.txt - # annotated-types - # asgiref - # astroid # pydantic # pydantic-core - # pylint - # rich - # rstcheck-core # typer +tzdata==2024.1 + # via + # -r requirements/quality.txt + # pydantic urllib3==2.2.2 # via # -r requirements/quality.txt @@ -375,12 +331,10 @@ wheel==0.44.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.20.0 +zipp==3.20.1 # via - # -r requirements/pip-tools.txt # -r requirements/quality.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index da0e2b3..f271593 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx amqp==5.2.0 # via kombu @@ -12,21 +12,15 @@ asgiref==3.8.1 # via django babel==2.16.0 # via sphinx -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # django - # djangorestframework - # kombu billiard==4.2.0 # via celery celery==5.4.0 # via # -c requirements/constraints.txt # edx-celeryutils -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -48,15 +42,16 @@ click-repl==0.3.0 # via celery code-annotations==1.8.0 # via edx-toggles -cryptography==43.0.0 +cryptography==43.0.1 # via pyjwt -django==4.2.15 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/base.in # django-config-models # django-crum # django-model-utils + # django-simple-history # django-waffle # djangorestframework # drf-jwt @@ -73,14 +68,12 @@ django-crum==0.7.9 # via # edx-django-utils # edx-toggles -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # -r requirements/base.in # edx-celeryutils -django-simple-history==3.1.1 - # via - # -c requirements/constraints.txt - # -r requirements/base.in +django-simple-history==3.7.0 + # via -r requirements/base.in django-waffle==4.1.0 # via # edx-django-utils @@ -96,9 +89,9 @@ djangorestframework==3.15.2 # edx-drf-extensions dnspython==2.6.1 # via pymongo -doc8==1.1.1 +doc8==1.1.2 # via -r requirements/doc.in -docutils==0.19 +docutils==0.21.2 # via # doc8 # readme-renderer @@ -118,20 +111,18 @@ edx-django-utils==5.15.0 # django-config-models # edx-drf-extensions # edx-toggles -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via -r requirements/base.in -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via edx-drf-extensions edx-sphinx-theme==3.1.0 # via -r requirements/doc.in edx-toggles==5.2.0 # via -r requirements/base.in -idna==3.7 +idna==3.8 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.3.0 - # via sphinx inflection==0.5.1 # via drf-yasg jinja2==3.1.4 @@ -152,7 +143,7 @@ packaging==24.1 # via # drf-yasg # sphinx -pbr==6.0.0 +pbr==6.1.0 # via stevedore pockets==0.9.1 # via sphinxcontrib-napoleon @@ -180,14 +171,12 @@ python-dateutil==2.9.0.post0 python-slugify==8.0.4 # via code-annotations pytz==2024.1 - # via - # babel - # drf-yasg + # via drf-yasg pyyaml==6.0.2 # via # code-annotations # drf-yasg -readme-renderer==43.0 +readme-renderer==44.0 # via -r requirements/doc.in requests==2.32.3 # via @@ -205,27 +194,27 @@ six==1.16.0 # sphinxcontrib-napoleon snowballstemmer==2.2.0 # via sphinx -sphinx==5.3.0 +sphinx==3.5.3 # via # -r requirements/doc.in # edx-sphinx-theme -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-napoleon==0.7 # via -r requirements/doc.in -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via # code-annotations # doc8 @@ -233,17 +222,10 @@ stevedore==5.2.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via doc8 typing-extensions==4.12.2 - # via - # asgiref - # edx-opaque-keys - # kombu + # via edx-opaque-keys tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery uritemplate==4.1.1 # via drf-yasg urllib3==2.2.2 @@ -255,5 +237,6 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit -zipp==3.20.0 - # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index aa7666a..189b91e 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,8 +8,6 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==8.3.0 - # via build packaging==24.1 # via build pip-tools==7.4.1 @@ -18,16 +16,10 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.44.0 # via # -r requirements/pip-tools.in # pip-tools -zipp==3.20.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/quality.txt b/requirements/quality.txt index 73d3ee5..a465ef4 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -14,12 +14,8 @@ astroid==3.2.4 # pylint-celery backports-tarfile==1.2.0 # via jaraco-context -backports-zoneinfo==0.2.1 - # via django -certifi==2024.7.4 +certifi==2024.8.30 # via requests -cffi==1.17.0 - # via cryptography charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -32,29 +28,24 @@ click-log==0.4.0 # via edx-lint code-annotations==1.8.0 # via edx-lint -cryptography==43.0.0 - # via secretstorage dill==0.3.8 # via pylint -django==4.2.15 +django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/quality.in -docutils==0.20.1 +docutils==0.21.2 # via # readme-renderer # rstcheck-core -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.in -idna==3.7 +idna==3.8 # via requests -importlib-metadata==8.3.0 +importlib-metadata==8.4.0 # via # keyring - # rstcheck-core # twine -importlib-resources==6.4.3 - # via keyring isort==5.13.2 # via # -r requirements/quality.in @@ -65,10 +56,6 @@ jaraco-context==6.0.1 # via keyring jaraco-functools==4.0.2 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.4 # via code-annotations keyring==25.3.0 @@ -81,13 +68,13 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -more-itertools==10.4.0 +more-itertools==10.5.0 # via # jaraco-classes # jaraco-functools nh3==0.2.18 # via readme-renderer -pbr==6.0.0 +pbr==6.1.0 # via stevedore pkginfo==1.10.0 # via twine @@ -95,11 +82,9 @@ platformdirs==4.2.2 # via pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pycparser==2.22 - # via cffi -pydantic==2.8.2 +pydantic==2.9.0 # via rstcheck-core -pydantic-core==2.20.1 +pydantic-core==2.23.2 # via pydantic pydocstyle==6.3.0 # via -r requirements/quality.in @@ -107,7 +92,7 @@ pygments==2.18.0 # via # readme-renderer # rich -pylint==3.2.6 +pylint==3.2.7 # via # edx-lint # pylint-celery @@ -125,7 +110,7 @@ python-slugify==8.0.4 # via code-annotations pyyaml==6.0.2 # via code-annotations -readme-renderer==43.0 +readme-renderer==44.0 # via twine requests==2.32.3 # via @@ -135,7 +120,7 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.8.0 # via # twine # typer @@ -143,8 +128,6 @@ rstcheck==6.2.4 # via -r requirements/quality.in rstcheck-core==1.2.1 # via rstcheck -secretstorage==3.3.3 - # via keyring shellingham==1.5.4 # via typer six==1.16.0 @@ -153,34 +136,26 @@ snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.5.1 # via django -stevedore==5.2.0 +stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via pylint tomlkit==0.13.2 # via pylint twine==5.1.1 # via -r requirements/quality.in -typer==0.12.4 +typer==0.12.5 # via rstcheck typing-extensions==4.12.2 # via - # annotated-types - # asgiref - # astroid # pydantic # pydantic-core - # pylint - # rich - # rstcheck-core # typer +tzdata==2024.1 + # via pydantic urllib3==2.2.2 # via # requests # twine -zipp==3.20.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.20.1 + # via importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index 9aae716..31462a0 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,9 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # +amqp==5.2.0 # via # -r requirements/base.txt # kombu @@ -11,25 +12,20 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/base.txt - # celery - # django - # djangorestframework - # kombu +billiard==4.2.0 # via # -r requirements/base.txt # celery +celery==5.4.0 # via # -c requirements/constraints.txt # -r requirements/base.txt # edx-celeryutils -certifi==2024.7.4 +certifi==2024.8.30 # via # -r requirements/base.txt # requests -cffi==1.17.0 +cffi==1.17.1 # via # -r requirements/base.txt # cryptography @@ -66,7 +62,7 @@ code-annotations==1.8.0 # edx-toggles coverage[toml]==7.6.1 # via pytest-cov -cryptography==43.0.0 +cryptography==43.0.1 # via # -r requirements/base.txt # pyjwt @@ -78,6 +74,7 @@ ddt==1.7.2 # django-config-models # django-crum # django-model-utils + # django-simple-history # django-waffle # djangorestframework # drf-jwt @@ -95,14 +92,12 @@ django-crum==0.7.9 # -r requirements/base.txt # edx-django-utils # edx-toggles -django-model-utils==4.5.1 +django-model-utils==5.0.0 # via # -r requirements/base.txt # edx-celeryutils -django-simple-history==3.1.1 - # via - # -c requirements/constraints.txt - # -r requirements/base.txt +django-simple-history==3.7.0 + # via -r requirements/base.txt django-waffle==4.1.0 # via # -r requirements/base.txt @@ -139,17 +134,15 @@ edx-django-utils==5.15.0 # django-config-models # edx-drf-extensions # edx-toggles -edx-drf-extensions==10.3.0 +edx-drf-extensions==10.4.0 # via -r requirements/base.txt -edx-opaque-keys==2.10.0 +edx-opaque-keys==2.11.0 # via # -r requirements/base.txt # edx-drf-extensions edx-toggles==5.2.0 # via -r requirements/base.txt -exceptiongroup==1.2.2 - # via pytest -idna==3.7 +idna==3.8 # via # -r requirements/base.txt # requests @@ -167,6 +160,7 @@ jsonfield==3.1.0 # via # -r requirements/base.txt # edx-celeryutils +kombu==5.4.0 # via # -r requirements/base.txt # celery @@ -185,7 +179,7 @@ packaging==24.1 # -r requirements/base.txt # drf-yasg # pytest -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/base.txt # stevedore @@ -222,7 +216,7 @@ pytest==8.3.2 # pytest-django pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via @@ -257,7 +251,7 @@ sqlparse==0.5.1 # via # -r requirements/base.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/base.txt # code-annotations @@ -267,20 +261,13 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -tomli==2.0.1 - # via - # coverage - # pytest typing-extensions==4.12.2 # via # -r requirements/base.txt - # asgiref # edx-opaque-keys - # kombu tzdata==2024.1 # via # -r requirements/base.txt - # backports-zoneinfo # celery uritemplate==4.1.1 # via @@ -290,6 +277,7 @@ urllib3==2.2.2 # via # -r requirements/base.txt # requests +vine==5.1.0 # via # -r requirements/base.txt # amqp diff --git a/setup.py b/setup.py index 42d0619..5c55ade 100644 --- a/setup.py +++ b/setup.py @@ -70,11 +70,12 @@ def is_requirement(line): keywords='Django edx', classifiers=[ 'Framework :: Django', - 'Framework :: Django :: 2.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.8', + 'Programming Language :: Python :: 3.11', ], packages=[ 'edx_name_affirmation', diff --git a/tox.ini b/tox.ini index 4783b49..7af789f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{42}-celery{53}, quality, rst_validation, docs, pii_check +envlist = py311-django{42}-celery{54}, quality, rst_validation, docs, pii_check [doc8] ignore = D001 @@ -37,8 +37,7 @@ norecursedirs = .* docs requirements site-packages deps = django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt - celery44: -r{toxinidir}/requirements/celery44.txt - celery50: -r{toxinidir}/requirements/celery50.txt + celery54: -r{toxinidir}/requirements/celery54.txt commands = python manage.py check pytest {posargs}