diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbab60c..a126bad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: matrix: os: [ubuntu-latest] python-version: - - '3.11' - '3.12' toxenv: [django42, django52, docs, quality] diff --git a/requirements/base.txt b/requirements/base.txt index 1f4abdb..9ab7f50 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/ci.txt b/requirements/ci.txt index 0c7efc4..8c3dcad 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,38 +1,42 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==5.5.2 - # via tox -chardet==5.2.0 +cachetools==7.0.3 # via tox colorama==0.4.6 # via tox -distlib==0.3.9 +distlib==0.4.0 # via virtualenv -filelock==3.18.0 +filelock==3.25.0 # via + # python-discovery # tox # virtualenv -packaging==25.0 +packaging==26.0 # via # pyproject-api # tox -platformdirs==4.3.7 +platformdirs==4.9.4 # via + # python-discovery # tox # virtualenv -pluggy==1.5.0 +pluggy==1.6.0 # via # -r requirements/ci.in # tox -pyproject-api==1.9.0 +pyproject-api==1.10.0 + # via tox +python-discovery==1.1.1 + # via virtualenv +tomli-w==1.2.0 # via tox -tox==4.25.0 +tox==4.49.0 # via -r requirements/ci.in -virtualenv==20.30.0 +virtualenv==21.1.0 # via # -r requirements/ci.in # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 1511019..72cc4cc 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -12,20 +12,9 @@ # this file from Github directly. It does not require packaging in edx-lint. # using LTS django version -Django<5.0 +Django<6.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 # See https://github.com/openedx/edx-platform/issues/35126 for more info 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 - -# Cause: https://github.com/openedx/edx-lint/issues/458 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. -pip<24.3 - -# Cause: https://github.com/openedx/edx-lint/issues/475 -# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved. -urllib3<2.3.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index eedab7d..362b8e9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,6 +12,3 @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index e4a7ef9..f0e5cf2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,78 +1,73 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.1 +asgiref==3.11.1 # via django -astroid==3.3.9 +astroid==4.0.4 # via # pylint # pylint-celery -backports-tarfile==1.2.0 - # via jaraco-context -cachetools==5.5.2 +cachetools==7.0.3 # via tox -certifi==2025.4.26 +certifi==2026.2.25 # via requests -cffi==1.17.1 +cffi==2.0.0 # via cryptography -chardet==5.2.0 - # via - # diff-cover - # tox -charset-normalizer==3.4.1 +chardet==7.0.1 + # via diff-cover +charset-normalizer==3.4.5 # via requests -click==8.1.8 +click==8.3.1 # via # click-log # code-annotations # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==2.3.0 +code-annotations==2.3.2 # via edx-lint colorama==0.4.6 # via tox -cryptography==44.0.2 +cryptography==46.0.5 # via secretstorage -diff-cover==9.2.4 +diff-cover==10.2.0 # via -r requirements/dev.in -dill==0.4.0 +dill==0.4.1 # via pylint -distlib==0.3.9 +distlib==0.4.0 # via virtualenv -django==4.2.20 +django==5.2.12 # via # -c requirements/common_constraints.txt # -r requirements/quality.in # edx-i18n-tools -docutils==0.21.2 +docutils==0.22.4 # via readme-renderer edx-i18n-tools==1.9.0 # via -r requirements/dev.in edx-lint==5.6.0 # via -r requirements/quality.in -filelock==3.18.0 +filelock==3.25.0 # via + # python-discovery # tox # virtualenv -id==1.5.0 +id==1.6.1 # via twine -idna==3.10 +idna==3.11 # via requests -importlib-metadata==8.7.0 - # via keyring -isort==6.0.1 +isort==8.0.1 # via # -r requirements/quality.in # pylint jaraco-classes==3.4.0 # via keyring -jaraco-context==6.0.1 +jaraco-context==6.1.1 # via keyring -jaraco-functools==4.1.0 +jaraco-functools==4.4.0 # via keyring jeepney==0.9.0 # via @@ -82,61 +77,61 @@ jinja2==3.1.6 # via # code-annotations # diff-cover -keyring==25.6.0 +keyring==25.7.0 # via twine -lxml[html-clean,html_clean]==5.4.0 +lxml[html-clean]==6.0.2 # via # edx-i18n-tools # lxml-html-clean -lxml-html-clean==0.4.2 +lxml-html-clean==0.4.4 # via lxml -markdown-it-py==3.0.0 +markdown-it-py==4.0.0 # via rich -markupsafe==3.0.2 +markupsafe==3.0.3 # via jinja2 mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -more-itertools==10.7.0 +more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.21 +nh3==0.3.3 # via readme-renderer -packaging==25.0 +packaging==26.0 # via # pyproject-api # tox # twine + # wheel path==16.16.0 # via edx-i18n-tools -pbr==6.1.1 - # via stevedore -platformdirs==4.3.7 +platformdirs==4.9.4 # via # pylint + # python-discovery # tox # virtualenv -pluggy==1.5.0 +pluggy==1.6.0 # via # -r requirements/dev.in # diff-cover # tox polib==1.2.0 # via edx-i18n-tools -pycodestyle==2.13.0 +pycodestyle==2.14.0 # via -r requirements/quality.in -pycparser==2.22 +pycparser==3.0 # via cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pygments==2.19.1 +pygments==2.19.2 # via # diff-cover # readme-renderer # rich -pylint==3.3.6 +pylint==4.0.5 # via # edx-lint # pylint-celery @@ -144,64 +139,62 @@ pylint==3.3.6 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.6.1 +pylint-django==2.7.0 # via edx-lint -pylint-plugin-utils==0.8.2 +pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django -pyproject-api==1.9.0 +pyproject-api==1.10.0 # via tox +python-discovery==1.1.1 + # via virtualenv python-slugify==8.0.4 # via code-annotations -pyyaml==6.0.2 +pyyaml==6.0.3 # via # code-annotations # edx-i18n-tools readme-renderer==44.0 # via twine -requests==2.32.3 +requests==2.32.5 # via - # id # requests-toolbelt # twine requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==14.0.0 +rich==14.3.3 # via twine -secretstorage==3.3.3 +secretstorage==3.5.0 # via keyring six==1.17.0 # via edx-lint -snowballstemmer==2.2.0 +snowballstemmer==3.0.1 # via pydocstyle -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.4.1 +stevedore==5.7.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomlkit==0.13.2 +tomli-w==1.2.0 + # via tox +tomlkit==0.14.0 # via pylint -tox==4.25.0 +tox==4.49.0 # via -r requirements/dev.in -twine==6.1.0 +twine==6.2.0 # via -r requirements/dev.in -urllib3==2.2.3 +urllib3==2.6.3 # via - # -c requirements/common_constraints.txt + # id # requests # twine -virtualenv==20.30.0 +virtualenv==21.1.0 # via # -r requirements/dev.in # tox -wheel==0.45.1 +wheel==0.46.3 # via -r requirements/dev.in -zipp==3.21.0 - # via importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/doc.txt b/requirements/doc.txt index 98f52b2..1a73b23 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -8,29 +8,27 @@ accessible-pygments==0.0.5 # via pydata-sphinx-theme alabaster==1.0.0 # via sphinx -asgiref==3.8.1 +asgiref==3.11.1 # via django -babel==2.17.0 +babel==2.18.0 # via # pydata-sphinx-theme # sphinx -backports-tarfile==1.2.0 - # via jaraco-context -beautifulsoup4==4.13.4 +beautifulsoup4==4.14.3 # via pydata-sphinx-theme -certifi==2025.4.26 +certifi==2026.2.25 # via requests -cffi==1.17.1 +cffi==2.0.0 # via cryptography -charset-normalizer==3.4.1 +charset-normalizer==3.4.5 # via requests -cryptography==44.0.2 +cryptography==46.0.5 # via secretstorage -django==4.2.20 +django==5.2.12 # via # -c requirements/common_constraints.txt # -r requirements/doc.in -doc8==1.1.2 +doc8==2.0.0 # via -r requirements/doc.in docutils==0.21.2 # via @@ -39,19 +37,17 @@ docutils==0.21.2 # readme-renderer # restructuredtext-lint # sphinx -id==1.5.0 +id==1.6.1 # via twine -idna==3.10 +idna==3.11 # via requests -imagesize==1.4.1 +imagesize==2.0.0 # via sphinx -importlib-metadata==8.7.0 - # via keyring jaraco-classes==3.4.0 # via keyring -jaraco-context==6.0.1 +jaraco-context==6.1.1 # via keyring -jaraco-functools==4.1.0 +jaraco-functools==4.4.0 # via keyring jeepney==0.9.0 # via @@ -59,34 +55,32 @@ jeepney==0.9.0 # secretstorage jinja2==3.1.6 # via sphinx -keyring==25.6.0 +keyring==25.7.0 # via twine -markdown-it-py==3.0.0 +markdown-it-py==4.0.0 # via rich -markupsafe==3.0.2 +markupsafe==3.0.3 # via jinja2 mdurl==0.1.2 # via markdown-it-py -more-itertools==10.7.0 +more-itertools==10.8.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.21 +nh3==0.3.3 # via readme-renderer -packaging==25.0 +packaging==26.0 # via # pydata-sphinx-theme # sphinx # twine -pbr==6.1.1 - # via stevedore pockets==0.9.1 # via sphinxcontrib-napoleon -pycparser==2.22 +pycparser==3.0 # via cffi pydata-sphinx-theme==0.15.4 # via sphinx-book-theme -pygments==2.19.1 +pygments==2.19.2 # via # accessible-pygments # doc8 @@ -98,33 +92,32 @@ readme-renderer==44.0 # via # -r requirements/doc.in # twine -requests==2.32.3 +requests==2.32.5 # via - # id # requests-toolbelt # sphinx # twine requests-toolbelt==1.0.0 # via twine -restructuredtext-lint==1.4.0 +restructuredtext-lint==2.0.2 # via doc8 rfc3986==2.0.0 # via twine -rich==14.0.0 +rich==14.3.3 # via twine -roman-numerals-py==3.1.0 +roman-numerals==4.1.0 # via sphinx -secretstorage==3.3.3 +secretstorage==3.5.0 # via keyring six==1.17.0 # via # pockets # sphinxcontrib-napoleon -snowballstemmer==2.2.0 +snowballstemmer==3.0.1 # via sphinx -soupsieve==2.7 +soupsieve==2.8.3 # via beautifulsoup4 -sphinx==8.2.3 +sphinx==9.1.0 # via # -r requirements/doc.in # pydata-sphinx-theme @@ -145,23 +138,18 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.4.1 +stevedore==5.7.0 # via doc8 -twine==6.1.0 +twine==6.2.0 # via -r requirements/doc.in -typing-extensions==4.13.2 +typing-extensions==4.15.0 # via # beautifulsoup4 # pydata-sphinx-theme -urllib3==2.2.3 +urllib3==2.6.3 # via - # -c requirements/common_constraints.txt + # id # requests # twine -zipp==3.21.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 1dd71b5..d89516b 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,22 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -build==1.2.2.post1 +build==1.4.0 # via pip-tools -click==8.1.8 +click==8.3.1 # via pip-tools -packaging==25.0 - # via build -pip-tools==7.4.1 +packaging==26.0 + # via + # build + # wheel +pip-tools==7.5.3 # via -r requirements/pip-tools.in pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.45.1 +wheel==0.46.3 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index e2ab5be..084d708 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.45.1 +packaging==26.0 + # via wheel +wheel==0.46.3 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.2 - # via - # -c /home/runner/work/web-fragments/web-fragments/requirements/common_constraints.txt - # -r requirements/pip.in -setuptools==80.1.0 +pip==26.0.1 + # via -r requirements/pip.in +setuptools==82.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index c9d8a67..536a87e 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,51 +1,49 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.1 +asgiref==3.11.1 # via django -astroid==3.3.9 +astroid==4.0.4 # via # pylint # pylint-celery -click==8.1.8 +click==8.3.1 # via # click-log # code-annotations # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==2.3.0 +code-annotations==2.3.2 # via edx-lint -dill==0.4.0 +dill==0.4.1 # via pylint -django==4.2.20 +django==5.2.12 # via # -c requirements/common_constraints.txt # -r requirements/quality.in edx-lint==5.6.0 # via -r requirements/quality.in -isort==6.0.1 +isort==8.0.1 # via # -r requirements/quality.in # pylint jinja2==3.1.6 # via code-annotations -markupsafe==3.0.2 +markupsafe==3.0.3 # via jinja2 mccabe==0.7.0 # via pylint -pbr==6.1.1 - # via stevedore -platformdirs==4.3.7 +platformdirs==4.9.4 # via pylint -pycodestyle==2.13.0 +pycodestyle==2.14.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.3.6 +pylint==4.0.5 # via # edx-lint # pylint-celery @@ -53,28 +51,25 @@ pylint==3.3.6 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.6.1 +pylint-django==2.7.0 # via edx-lint -pylint-plugin-utils==0.8.2 +pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django python-slugify==8.0.4 # via code-annotations -pyyaml==6.0.2 +pyyaml==6.0.3 # via code-annotations six==1.17.0 # via edx-lint -snowballstemmer==2.2.0 +snowballstemmer==3.0.1 # via pydocstyle -sqlparse==0.5.3 +sqlparse==0.5.5 # via django -stevedore==5.4.1 +stevedore==5.7.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tomlkit==0.13.2 +tomlkit==0.14.0 # via pylint - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 5608c0c..f5ad03f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,24 +1,28 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -coverage[toml]==7.8.0 +coverage[toml]==7.13.4 # via pytest-cov ddt==1.3.1 # via -r requirements/test.in -iniconfig==2.1.0 +iniconfig==2.3.0 # via pytest -packaging==25.0 +packaging==26.0 # via pytest -pluggy==1.5.0 +pluggy==1.6.0 + # via + # pytest + # pytest-cov +pygments==2.19.2 # via pytest -pytest==8.3.5 +pytest==9.0.2 # via # pytest-cov # pytest-django -pytest-cov==6.1.1 +pytest-cov==7.0.0 # via -r requirements/test.in -pytest-django==4.11.1 +pytest-django==4.12.0 # via -r requirements/test.in diff --git a/setup.py b/setup.py index 2391be1..fc416c2 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,6 @@ def get_version(*file_paths): 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', ], extras_require={ diff --git a/tox.ini b/tox.ini index cf8173a..30565f3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{311,312}-django{42,52}, docs, quality +envlist = py312-django{42,52}, docs, quality [pytest] addopts = --cov web_fragments --cov-report term-missing --cov-report xml diff --git a/web_fragments/__init__.py b/web_fragments/__init__.py index ba8101e..f0b1398 100644 --- a/web_fragments/__init__.py +++ b/web_fragments/__init__.py @@ -1,4 +1,4 @@ """ Web fragments. """ -__version__ = '3.1.0' +__version__ = '4.0.0'