diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d881a61..90bf5eb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,12 @@ Change Log .. There should always be an "Unreleased" section for changes pending release. +[2.6.0] - 2024-03-30 +~~~~~~~~~~~~~~~~~~~~ + +* Adding python3.11 and 3.12 support. + + [2.5.1] - 2023-09-22 ~~~~~~~~~~~~~~~~~~~~ diff --git a/Makefile b/Makefile index f0aa743..83ac6c2 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,13 @@ extract_translations: ## extract strings to be translated, outputting .mo files fake_translations: extract_translations dummy_translations compile_translations ## generate and compile dummy translation files +COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt +.PHONY: $(COMMON_CONSTRAINTS_TXT) +$(COMMON_CONSTRAINTS_TXT): + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +upgrade: $(COMMON_CONSTRAINTS_TXT) # update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -r requirements/pip-tools.txt pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in pip-compile --no-emit-trusted-host --no-emit-index-url --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/config_models/__init__.py b/config_models/__init__.py index 0bf3af8..c6178ea 100644 --- a/config_models/__init__.py +++ b/config_models/__init__.py @@ -2,4 +2,4 @@ Configuration models for Django allowing config management with auditing. """ -__version__ = '2.5.1' +__version__ = '2.6.0' diff --git a/requirements/base.txt b/requirements/base.txt index 8333ff8..67deac5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,15 +4,19 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # django + # djangorestframework cffi==1.16.0 # via pynacl click==8.1.7 # via edx-django-utils -django==3.2.24 +django==4.2.11 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # django-crum # django-waffle @@ -22,27 +26,23 @@ django-crum==0.7.9 # via edx-django-utils django-waffle==4.1.0 # via edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via -r requirements/base.in -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via -r requirements/base.in -newrelic==9.6.0 +newrelic==9.8.0 # via edx-django-utils pbr==6.0.0 # via stevedore psutil==5.9.8 # via edx-django-utils -pycparser==2.21 +pycparser==2.22 # via cffi pynacl==1.5.0 # via edx-django-utils -pytz==2024.1 - # via - # django - # djangorestframework sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via edx-django-utils -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via asgiref diff --git a/requirements/ci.txt b/requirements/ci.txt index c832505..255b0e7 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,11 +6,11 @@ # 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 @@ -34,5 +34,5 @@ tox==3.28.0 # tox-travis tox-travis==0.13 # via -r requirements/ci.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 0000000..e69de29 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 3cc7c71..2496b99 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -8,8 +8,8 @@ # pin when possible. Writing an issue against the offending project and # linking to it here is good. -# Common constraints for edx repos --c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt +# This file contains all 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 diff --git a/requirements/dev.txt b/requirements/dev.txt index 6338be6..c0ec2fe 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,16 +4,22 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/quality.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # -r requirements/quality.txt # pylint # pylint-celery -build==1.0.3 +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/quality.txt + # django + # djangorestframework +build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -34,15 +40,15 @@ click-log==0.4.0 # via # -r requirements/quality.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/quality.txt # pytest-cov -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/quality.txt dill==0.3.8 # via @@ -52,9 +58,8 @@ distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==3.2.24 +django==4.2.11 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-crum # django-waffle @@ -70,11 +75,11 @@ django-waffle==4.1.0 # via # -r requirements/quality.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via -r requirements/quality.txt edx-django-release-util==1.3.0 # via -r requirements/quality.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via -r requirements/quality.txt edx-i18n-tools==1.3.0 # via -r requirements/dev.in @@ -84,14 +89,14 @@ exceptiongroup==1.2.0 # via # -r requirements/quality.txt # pytest -filelock==3.13.1 +filelock==3.13.3 # via # -r requirements/ci.txt # tox # virtualenv freezegun==1.4.0 # via -r requirements/quality.txt -importlib-metadata==7.0.1 +importlib-metadata==7.1.0 # via # -r requirements/pip-tools.txt # build @@ -107,7 +112,7 @@ jinja2==3.1.3 # via # -r requirements/quality.txt # code-annotations -lxml==5.1.0 +lxml==5.1.1 # via edx-i18n-tools markupsafe==2.1.5 # via @@ -117,11 +122,11 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/quality.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -135,7 +140,7 @@ pbr==6.0.0 # via # -r requirements/quality.txt # stevedore -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt platformdirs==4.2.0 # via @@ -161,13 +166,13 @@ py==1.11.0 # tox pycodestyle==2.11.1 # via -r requirements/quality.txt -pycparser==2.21 +pycparser==2.22 # via # -r requirements/quality.txt # cffi pydocstyle==6.3.0 # via -r requirements/quality.txt -pylint==3.0.3 +pylint==3.1.0 # via # -r requirements/quality.txt # edx-lint @@ -196,16 +201,16 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.0.1 +pytest==8.1.1 # via # -r requirements/quality.txt # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/quality.txt pytest-django==4.8.0 # via -r requirements/quality.txt -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/quality.txt # freezegun @@ -213,11 +218,6 @@ python-slugify==8.0.4 # via # -r requirements/quality.txt # code-annotations -pytz==2024.1 - # via - # -r requirements/quality.txt - # django - # djangorestframework pyyaml==6.0.1 # via # -r requirements/quality.txt @@ -240,7 +240,7 @@ sqlparse==0.4.4 # via # -r requirements/quality.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/quality.txt # code-annotations @@ -261,7 +261,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.12.3 +tomlkit==0.12.4 # via # -r requirements/quality.txt # pylint @@ -271,21 +271,21 @@ tox==3.28.0 # tox-travis tox-travis==0.13 # via -r requirements/ci.txt -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/quality.txt # asgiref # astroid # pylint -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/ci.txt # tox -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 1e2df1c..8da8d71 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -8,7 +8,7 @@ accessible-pygments==0.0.4 # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django @@ -16,6 +16,12 @@ babel==2.14.0 # via # pydata-sphinx-theme # sphinx +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # django + # djangorestframework beautifulsoup4==4.12.3 # via pydata-sphinx-theme certifi==2024.2.2 @@ -23,7 +29,6 @@ certifi==2024.2.2 cffi==1.16.0 # via # -r requirements/test.txt - # cryptography # pynacl charset-normalizer==3.3.2 # via requests @@ -31,17 +36,14 @@ click==8.1.7 # via # -r requirements/test.txt # edx-django-utils -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov -cryptography==42.0.3 - # via secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt -django==3.2.24 +django==4.2.11 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum # django-waffle @@ -56,7 +58,7 @@ django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via -r requirements/test.txt docutils==0.19 # via @@ -65,7 +67,7 @@ docutils==0.19 # sphinx edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via -r requirements/test.txt exceptiongroup==1.2.0 # via @@ -77,12 +79,12 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.1 +importlib-metadata==7.1.0 # via # keyring # sphinx # twine -importlib-resources==6.1.1 +importlib-resources==6.4.0 # via keyring iniconfig==2.0.0 # via @@ -90,13 +92,13 @@ iniconfig==2.0.0 # pytest jaraco-classes==3.3.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage +jaraco-context==4.3.0 + # via keyring +jaraco-functools==4.0.0 + # via keyring jinja2==3.1.3 # via sphinx -keyring==24.3.0 +keyring==25.0.0 # via twine markdown-it-py==3.0.0 # via rich @@ -105,14 +107,16 @@ markupsafe==2.1.5 mdurl==0.1.2 # via markdown-it-py more-itertools==10.2.0 - # via jaraco-classes -newrelic==9.6.0 + # via + # jaraco-classes + # jaraco-functools +newrelic==9.8.0 # via # -r requirements/test.txt # edx-django-utils -nh3==0.2.15 +nh3==0.2.17 # via readme-renderer -packaging==23.2 +packaging==24.0 # via # -r requirements/test.txt # pydata-sphinx-theme @@ -122,7 +126,7 @@ pbr==6.0.0 # via # -r requirements/test.txt # stevedore -pkginfo==1.9.6 +pkginfo==1.10.0 # via twine pluggy==1.4.0 # via @@ -132,7 +136,7 @@ psutil==5.9.8 # via # -r requirements/test.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi @@ -149,30 +153,26 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.1 +pytest==8.1.1 # 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 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # freezegun pytz==2024.1 - # via - # -r requirements/test.txt - # babel - # django - # djangorestframework + # via babel pyyaml==6.0.1 # via # -r requirements/test.txt # edx-django-release-util -readme-renderer==42.0 +readme-renderer==43.0 # via # -r requirements/doc.in # twine @@ -185,10 +185,8 @@ requests-toolbelt==1.0.0 # via twine rfc3986==2.0.0 # via twine -rich==13.7.0 +rich==13.7.1 # via twine -secretstorage==3.3.3 - # via keyring six==1.16.0 # via # -r requirements/test.txt @@ -221,7 +219,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # edx-django-utils @@ -232,7 +230,7 @@ tomli==2.0.1 # pytest twine==5.0.0 # via -r requirements/doc.in -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/test.txt # asgiref @@ -242,7 +240,7 @@ urllib3==2.2.1 # via # requests # twine -zipp==3.17.0 +zipp==3.18.1 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 44c48d9..1471edd 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,15 +4,15 @@ # # make upgrade # -build==1.0.3 +build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.1 +importlib-metadata==7.1.0 # via build -packaging==23.2 +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 +23,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/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/quality.txt b/requirements/quality.txt index 83b3ea4..95f8f51 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,14 +4,20 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.0.3 +astroid==3.1.0 # via # pylint # pylint-celery +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # django + # djangorestframework cffi==1.16.0 # via # -r requirements/test.txt @@ -25,19 +31,18 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via # -r requirements/test.txt # pytest-cov -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via pylint -django==3.2.24 +django==4.2.11 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum # django-waffle @@ -52,11 +57,11 @@ django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via -r requirements/test.txt edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via -r requirements/test.txt edx-lint==5.3.6 # via -r requirements/quality.in @@ -78,11 +83,11 @@ markupsafe==2.1.5 # via jinja2 mccabe==0.7.0 # via pylint -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/test.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via # -r requirements/test.txt # pytest @@ -102,13 +107,13 @@ psutil==5.9.8 # edx-django-utils pycodestyle==2.11.1 # via -r requirements/quality.in -pycparser==2.21 +pycparser==2.22 # via # -r requirements/test.txt # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.0.3 +pylint==3.1.0 # via # edx-lint # pylint-celery @@ -126,26 +131,21 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==8.0.1 +pytest==8.1.1 # 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 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # -r requirements/test.txt # freezegun python-slugify==8.0.4 # via code-annotations -pytz==2024.1 - # via - # -r requirements/test.txt - # django - # djangorestframework pyyaml==6.0.1 # via # -r requirements/test.txt @@ -163,7 +163,7 @@ sqlparse==0.4.4 # via # -r requirements/test.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/test.txt # code-annotations @@ -176,9 +176,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/test.txt # asgiref diff --git a/requirements/test.txt b/requirements/test.txt index f369981..4a2e9ad 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,10 +4,16 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.1 # via # -r requirements/base.txt # django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -c requirements/constraints.txt + # -r requirements/base.txt + # django + # djangorestframework cffi==1.16.0 # via # -r requirements/base.txt @@ -16,12 +22,11 @@ click==8.1.7 # via # -r requirements/base.txt # edx-django-utils -coverage[toml]==7.4.1 +coverage[toml]==7.4.4 # via pytest-cov -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-crum # django-waffle @@ -39,7 +44,7 @@ django-waffle==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.3.0 # via -r requirements/test.in -edx-django-utils==5.10.1 +edx-django-utils==5.12.0 # via -r requirements/base.txt exceptiongroup==1.2.0 # via pytest @@ -47,11 +52,11 @@ freezegun==1.4.0 # via -r requirements/test.in iniconfig==2.0.0 # via pytest -newrelic==9.6.0 +newrelic==9.8.0 # via # -r requirements/base.txt # edx-django-utils -packaging==23.2 +packaging==24.0 # via pytest pbr==6.0.0 # via @@ -63,7 +68,7 @@ psutil==5.9.8 # via # -r requirements/base.txt # edx-django-utils -pycparser==2.21 +pycparser==2.22 # via # -r requirements/base.txt # cffi @@ -71,21 +76,16 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.0.1 +pytest==8.1.1 # 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.8.2 +python-dateutil==2.9.0.post0 # via freezegun -pytz==2024.1 - # via - # -r requirements/base.txt - # django - # djangorestframework pyyaml==6.0.1 # via edx-django-release-util six==1.16.0 @@ -96,7 +96,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.1.0 +stevedore==5.2.0 # via # -r requirements/base.txt # edx-django-utils @@ -104,7 +104,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref