diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 92636cd8..9bd82a45 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.21.3 +current_version = 0.21.4 commit = True tag = True diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c28f509e..7c94bc81 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -30,6 +30,6 @@ sphinx: # Optional but recommended, declare the Python requirements required # to build your documentation # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html - python: - install: - - requirements: requirements.docs.txt +python: + install: + - requirements: requirements.docs.txt diff --git a/HISTORY.rst b/HISTORY.rst index 97a38e55..36e23b64 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,3 +1,12 @@ +Next release +------------ +* + +0.21.4 (2024-11-20) +------------------- +* Add support for python 3.12 +* Bump supported dependencies + 0.21.3 (2023-01-11) ------------------- * Fix spelling of Python 3.5-specific requirements diff --git a/Makefile b/Makefile index bf57816f..e08117c7 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ _test: $(VENV) TEST_FILES = $(shell find tests -maxdepth 1 -name test_\*.py | cut -c 7- | cut -d. -f1) $(TEST_FILES): $(VENV) - . $(BIN)/activate && py.test -k $@ $(ARGS) + . $(BIN)/activate && pytest -k $@ $(ARGS) export DEBUGLOG=log export DEVEL=1 @@ -84,7 +84,7 @@ migrate: $(BIN)/python tests/django_app/manage.py migrate celery-worker: lib/redis - $(BIN)/talisker.celery worker -q -A tests.celery_app + $(BIN)/talisker.celery -q -A tests.celery_app worker celery-client: lib/redis $(BIN)/python tests/celery_app.py @@ -119,7 +119,7 @@ github-tox: $(VENV) tox coverage: $(VENV) - $(BIN)/py.test --cov=talisker --cov-report html:htmlcov --cov-report term + $(BIN)/pytest --cov=talisker --cov-report html:htmlcov --cov-report term $(BROWSER) htmlcov/index.html docs: $(VENV) @@ -190,7 +190,6 @@ release-build: release-check $(MAKE) setup.py $(MAKE) _build $(MAKE) release-test PY=3 - $(MAKE) release-test PY=2 release-tag: VERSION=$(shell $(BIN)/python setup.py --version) release-tag: diff --git a/README.rst b/README.rst index d90f3139..7b71e282 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Python version support ---------------------- Talisker 0.20.0 was the last to support Python 2.7. -Talisker version >=0.21.0 only supports Python 3.5, 3.6, 3.8 and 3.10, as +Talisker version >=0.21.0 only supports Python 3.x, as they come with Ubuntu LTS releases. Quick Start diff --git a/docs/conf.py b/docs/conf.py index 9592a14d..40aa98f4 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,7 +73,7 @@ # for |version| and |release|, also used in various other places throughout # the built documents. # The short X.Y version. -version = '0.21.3' +version = '0.21.4' # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.cfg b/setup.cfg index fc0179c0..0b7ac46d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ filterwarnings = ignore [metadata] name = talisker -version = 0.21.3 +version = 0.21.4 description = A common WSGI stack long_description = file: README.rst author = Simon Davy @@ -61,7 +61,7 @@ celery = celery>=4;python_version>"3.5" django = django~=2.2;python_version~="3.5.0" - django<4;python_version>"3.5" + django<5;python_version>"3.5" prometheus = prometheus-client~=0.7.0;python_version~="3.5.0" prometheus-client<0.8;python_version>"3.5" diff --git a/setup.py b/setup.py index 0af34635..5e7f4c11 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ ---------------------- Talisker 0.20.0 was the last to support Python 2.7. -Talisker version >=0.21.0 only supports Python 3.5, 3.6, 3.8 and 3.10, as +Talisker version >=0.21.0 only supports Python 3.x, as they come with Ubuntu LTS releases. Quick Start @@ -149,7 +149,7 @@ ], django=[ 'django~=2.2;python_version~="3.5.0"', - 'django<4;python_version>"3.5"', + 'django<5;python_version>"3.5"', ], flask=[ 'flask~=1.1;python_version~="3.5.0"', @@ -204,6 +204,6 @@ ], test_suite='tests', url='https://github.com/canonical-ols/talisker', - version='0.21.3', + version='0.21.4', zip_safe=False, ) diff --git a/talisker/__init__.py b/talisker/__init__.py index bebafbc3..f37e99b5 100644 --- a/talisker/__init__.py +++ b/talisker/__init__.py @@ -42,7 +42,7 @@ request_timeout, ) -__version__ = '0.21.3' +__version__ = '0.21.4' __all__ = [ 'initialise', 'get_config', diff --git a/tests/django_app/django_app/urls.py b/tests/django_app/django_app/urls.py index bba513d9..d39d651c 100644 --- a/tests/django_app/django_app/urls.py +++ b/tests/django_app/django_app/urls.py @@ -36,17 +36,17 @@ 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url from django.contrib import admin +from django.urls import re_path from django_app import views from django.conf import settings from django.conf.urls.static import static urlpatterns = [ - url(r'^admin/', admin.site.urls), - url(r'', views.index), - url(r'^error/', views.error), - url(r'^celery/', views.celery), - url(r'^db/', views.db), + re_path(r'^admin/', admin.site.urls), + re_path(r'', views.index), + re_path(r'^error/', views.error), + re_path(r'^celery/', views.celery), + re_path(r'^db/', views.db), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)