Merge pull request #609 from maxiberta/v0.21.4

Release v0.21.4

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.3
+current_version = 0.21.4
 commit = True
 tag = True
 

.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

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

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:

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

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
 

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"

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,
 )

talisker/__init__.py

@@ -42,7 +42,7 @@
     request_timeout,
 )
 
-__version__ = '0.21.3'
+__version__ = '0.21.4'
 __all__ = [
     'initialise',
     'get_config',

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)