From 085151ccda60972446618f21f51caf4f1838346b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Wed, 14 Feb 2024 00:18:49 +0500 Subject: [PATCH] build: adding python 312 support. --- CHANGELOG.rst | 7 +++++++ edx_django_utils/__init__.py | 4 ++++ requirements/doc.in | 1 + requirements/doc.txt | 2 ++ requirements/quality.in | 1 + tox.ini | 30 +++++++++++++++++------------- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 13811a92..b0744c27 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,13 @@ Change Log .. There should always be an "Unreleased" section for changes pending release. + +[5.12.0] - 2024-03-29 +--------------------- +Added +~~~~~ +* Added support for ``Python 3.11`` + [5.11.0] - 2024-03-06 --------------------- Added diff --git a/edx_django_utils/__init__.py b/edx_django_utils/__init__.py index ae56e85f..774452b3 100644 --- a/edx_django_utils/__init__.py +++ b/edx_django_utils/__init__.py @@ -2,7 +2,11 @@ EdX utilities for Django Application development.. """ +<<<<<<< HEAD __version__ = "5.11.0" +======= +__version__ = "5.10.2" +>>>>>>> fd3417d (build: adding python 312 support.) default_app_config = ( "edx_django_utils.apps.EdxDjangoUtilsConfig" diff --git a/requirements/doc.in b/requirements/doc.in index 65db8348..3ad8d9ab 100644 --- a/requirements/doc.in +++ b/requirements/doc.in @@ -10,3 +10,4 @@ Sphinx # Documentation builder twine factory-boy pytest #Needed? +wheel diff --git a/requirements/doc.txt b/requirements/doc.txt index 0a80748f..a91ba7df 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -243,6 +243,8 @@ urllib3==2.2.1 # via # requests # twine +wheel==0.42.0 + # via -r requirements/doc.in zipp==3.18.1 # via # importlib-metadata diff --git a/requirements/quality.in b/requirements/quality.in index 738b13f9..3e741c49 100644 --- a/requirements/quality.in +++ b/requirements/quality.in @@ -7,3 +7,4 @@ edx-lint # edX pylint rules and plugins isort # to standardize order of imports pycodestyle # PEP 8 compliance validation pydocstyle # PEP 257 compliance validation + diff --git a/tox.ini b/tox.ini index 0170ed04..c4a796be 100644 --- a/tox.ini +++ b/tox.ini @@ -36,25 +36,28 @@ addopts = --cov edx_django_utils --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements [testenv] -deps = +deps = +<<<<<<< HEAD setuptools +======= +>>>>>>> fd3417d (build: adding python 312 support.) django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt -commands = +commands = python -Wd -m pytest {posargs} [testenv:docs] -setenv = +setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = {toxinidir} -allowlist_externals = +allowlist_externals = make rm -deps = +deps = setuptools wheel -r{toxinidir}/requirements/doc.txt -commands = +commands = doc8 --ignore-path docs/_build README.rst docs rm -f docs/edx_django_utils.rst rm -f docs/modules.rst @@ -64,17 +67,18 @@ commands = twine check dist/* [testenv:quality] -setenv = +setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = {toxinidir} -allowlist_externals = +allowlist_externals = make rm touch -deps = +deps = setuptools -r{toxinidir}/requirements/quality.txt -commands = + setuptools +commands = touch tests/__init__.py pylint edx_django_utils tests test_utils manage.py setup.py rm tests/__init__.py @@ -84,9 +88,9 @@ commands = make selfcheck [testenv:isort] -allowlist_externals = +allowlist_externals = make -deps = +deps = -r{toxinidir}/requirements/quality.txt -commands = +commands = isort tests test_utils edx_django_utils manage.py setup.py test_settings.py