Merge pull request #618 from maxiberta/assorted-updates

Release 0.23.0

Author: maxiberta

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.22.0
+current_version = 0.23.0
 commit = True
 tag = True
 

.github/workflows/tox.yml

@@ -21,15 +21,15 @@ jobs:
           POSTGRES_PASSWORD: django_app
         ports:
           - 5432:5432
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-        python: [3.5, 3.6, 3.8, "3.10", "3.12"]
+        python: [3.8, "3.10", "3.12"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
         env:

HISTORY.rst

@@ -1,6 +1,13 @@
 Next release
 ------------
-*
+
+
+0.23.0 (2026-03-18)
+-------------------
+
+* Improve compatibility with latest gunicorn and setuptools
+* Drop support for python 3.5 & 3.6
+* Extra python 2 cleanup
 
 0.22.0 (2025-03-20)
 -------------------
@@ -14,16 +21,19 @@ 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
 * Drop the future library
 
 0.21.2 (2022-10-07)
 -------------------
+
 * Add support for python 3.10
 * Reduce test complexity by only supporting python versions that
   come with an ubuntu lts

Makefile

@@ -18,6 +18,7 @@ VENV = $(VENV_PATH)/ready
 BIN = $(VENV_PATH)/bin
 PY3 = $(shell which python3)
 PYTHON ?= $(shell readlink -f $(PY3))
+PYTEST = . $(BIN)/activate && $(BIN)/pytest
 TALISKER_EXTRAS=gunicorn,raven,flask,django,celery,prometheus,pg,dev,asyncio
 LIMBO_REQUIREMENTS=tests/requirements.limbo.txt
 REQUIREMENTS=$(shell ls requirements.*.txt)
@@ -29,14 +30,14 @@ $(VENV_PATH):
 	virtualenv $(VENV_PATH) -p $(PYTHON)
 
 setup.py: setup.cfg scripts/build_setup.py | $(VENV_PATH)
-	env/bin/python scripts/build_setup.py > setup.py
+	$(BIN)/python scripts/build_setup.py > setup.py
 
 $(LIMBO_REQUIREMENTS) limbo: setup.cfg requirements.*.txt scripts/limbo.py | $(VENV_PATH)
-	env/bin/python scripts/limbo.py requirements.tests.txt --extras=$(TALISKER_EXTRAS) > $(LIMBO_REQUIREMENTS)
+	$(BIN)/python scripts/limbo.py requirements.tests.txt --extras=$(TALISKER_EXTRAS) > $(LIMBO_REQUIREMENTS)
 
 # workaround to allow tox to build limbo requirements on demand
 limbo-env: $(LIMBO_REQUIREMENTS)
-	pip install $(TOX_OPTS) -r requirements.limbo.text $(TOX_PACKAGES)
+	$(BIN)/pip install $(TOX_OPTS) -r $(LIMBO_REQUIREMENTS) $(TOX_PACKAGES)
 
 $(VENV): setup.py $(REQUIREMENTS) | $(VENV_PATH)
 	$(BIN)/pip install -U pip
@@ -49,11 +50,11 @@ lint: $(VENV)
 	$(BIN)/flake8 talisker tests
 
 _test: $(VENV)
-	. $(BIN)/activate && $(BIN)/pytest --timeout=15 --no-success-flaky-report $(ARGS)
+	$(PYTEST) --timeout=15 --no-success-flaky-report $(ARGS)
 
 TEST_FILES = $(shell find tests -maxdepth 1 -name test_\*.py  | cut -c 7- | cut -d. -f1)
 $(TEST_FILES): $(VENV)
-	. $(BIN)/activate && pytest -k $@ $(ARGS)
+	$(PYTEST) -k $@ $(ARGS)
 
 export DEBUGLOG=log
 export DEVEL=1
@@ -70,7 +71,7 @@ run_multiprocess: run
 lib/sqlalchemy:
 	$(BIN)/pip install sqlalchemy
 
-flask: | lib/sqlalchemy
+flask: $(VENV) | lib/sqlalchemy
 	$(TALISKER) tests.flask_app:app
 
 lib/redis:
@@ -99,27 +100,25 @@ statsd:
 	$(BIN)/python tests/udpecho.py
 
 test: _test lint
-	@echo "Remember to run 'make tox' to test change against more Python versions"
+	@echo "Remember to run 'make tox' to test changes against more Python versions"
 
 debug-test:
-	. $(BIN)/activate && $(BIN)/pytest -s --pdb $(ARGS)
+	$(PYTEST) -s --pdb $(ARGS)
 
 tox: $(VENV) $(LIMBO_REQUIREMENTS)
 	$(BIN)/tox $(ARGS)
 
 # use requirements as constraints files
 travis: $(VENV_PATH)
-	env/bin/pip install tox setuptools $(subst requirements,-c requirements,$(REQUIREMENTS))
-	$(MAKE) $(LIMBO_REQUIREMENTS)
-	env/bin/tox
+	$(BIN)/pip install tox $(subst requirements,-c requirements,$(REQUIREMENTS))
+	$(MAKE) tox
 
 github-tox: $(VENV)
-	. $(BIN)/activate && pip install tox setuptools $(subst requirements,-c requirements,$(REQUIREMENTS))
-	$(MAKE) $(LIMBO_REQUIREMENTS)
-	tox
+	$(BIN)/pip install tox $(subst requirements,-c requirements,$(REQUIREMENTS))
+	$(MAKE) tox
 
 coverage: $(VENV)
-	$(BIN)/pytest --cov=talisker --cov-report html:htmlcov --cov-report term
+	$(PYTEST) --cov=talisker --cov-report html:htmlcov --cov-report term
 	$(BROWSER) htmlcov/index.html
 
 docs: $(VENV)
@@ -135,7 +134,7 @@ clean: clean-build clean-pyc clean-test
 clean-build:
 	rm build/ dist/ .eggs/ -rf
 	find . -name '*.egg-info' | xargs rm -rf
-	find . -name '*.egg' | xargs rm -f
+	find . -name '*.egg' | xargs rm -rf
 
 clean-pyc:
 	find . -name '*.pyc' | xargs rm -f
@@ -149,8 +148,6 @@ clean-test:
 
 # publishing
 RELEASE_TOOLS = $(BIN)/twine $(BIN)/bumpversion
-PY2ENV_PATH = .py2env
-PY2ENV = $(PY2ENV_PATH)/.done
 PACKAGE_NAME = $(shell $(BIN)/python setup.py --name)
 PACKAGE_FULLNAME = $(shell $(BIN)/python setup.py --fullname)
 PACKAGE_VERSION = $(shell $(BIN)/python setup.py --version)
@@ -163,18 +160,11 @@ $(RELEASE_TOOLS): $(VENV)
 	echo $(RELEASE_TOOLS)
 	$(BIN)/pip install twine bumpversion
 
-# minimal python2 env to build p2 wheel
-$(PY2ENV):
-	virtualenv $(PY2ENV_PATH) -p /usr/bin/python2.7
-	$(PY2ENV_PATH)/bin/pip install wheel
-	touch $@
-
 # force build every time, it's not slow
-_build: $(VENV) $(PY2ENV)
+_build: $(VENV)
 	rm -rf dist/*
 	$(BIN)/python setup.py sdist
 	$(BIN)/python setup.py bdist_wheel
-	$(PY2ENV_PATH)/bin/python setup.py bdist_wheel
 
 release-check: $(RELEASE_TOOLS)
 	git checkout master
@@ -198,7 +188,7 @@ release-tag:
 	git tag v$(VERSION)
 	git push origin master
 
-.PHONY: releast-test
+.PHONY: release-test
 release-test: WHEELENV=/tmp/talisker-test-wheel-py$(PY)
 release-test: SDISTENV=/tmp/talisker-test-sdist-py$(PY)
 release-test:

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.22.0'
+version = '0.23.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

requirements.devel.txt

@@ -1 +1,2 @@
 tox==3.28.0
+tox-pip-version==0.0.7

requirements.docs.txt

@@ -1,3 +1,3 @@
-Sphinx==5.3.0;python_version=="3.6"
-Sphinx==7.0.1;python_version>"3.6"
-werkzeug
+Sphinx==7.0.1
+werkzeug
+setuptools<=81  # pkg_resources was removed from setuptools 82

requirements.tests.txt

@@ -1,8 +1,7 @@
 # these are pinned for repeatability, but updated by pyup.io to be latest
 pytest==4.6.9;python_version<"3.10"
 pytest>7;python_version>="3.10"
-more-itertools<8.11.0;python_version<"3.6"
-more-itertools;python_version>="3.6"
+more-itertools
 freezegun==0.3.14
 pytest-cov==2.8.1;python_version<"3.10"
 pytest-cov>2.8;python_version>="3.10"
@@ -13,11 +12,10 @@ pytest-timeout==1.3.4
 responses==0.10.6  # pyup: <0.10.9
 # setuptools 45+ does do py2
 setuptools==44.0.0;python_version<"3.10"
-setuptools>64;python_version>="3.10"
+setuptools>64,<=81;python_version>="3.10"
 coverage==5.0.3;python_version<"3.10"
-coverage>=6;python_version>="3.10"
-flaky==3.7.0;python_version<"3.6"
-flaky==3.8.1;python_version>="3.6"
+coverage>=6.0;python_version>="3.10"
+flaky==3.8.1
 
 # for integration tests
 # eventlet is pinned until https://github.com/benoitc/gunicorn/pull/2581
@@ -32,7 +30,3 @@ greenlet<2;python_version<"3.10"
 # newer celery versions
 redis>=3.2.0
 SQLAlchemy==1.3.13
-# newer versions of celery pin vine versions, however
-# older versions don't. This pin is for limbo test runs for
-# celery 3.x on python 2.7.
-vine<5.0;python_version<"3.6"

setup.cfg

@@ -14,7 +14,7 @@ filterwarnings = ignore
 
 [metadata]
 name = talisker
-version = 0.22.0
+version = 0.23.0
 description = A common WSGI stack
 long_description = file: README.rst
 author = Simon Davy
@@ -29,8 +29,6 @@ classifiers =
 	Topic :: Internet :: WWW/HTTP :: WSGI
 	Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
 	Topic :: System :: Logging
-	Programming Language :: Python :: 3.5
-	Programming Language :: Python :: 3.6
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.12
@@ -43,43 +41,32 @@ packages = talisker
 test_suite = tests
 package_dir = talisker=talisker
 install_requires =
-	Werkzeug~=1.0;python_version~="3.5.0"
-	Werkzeug<4;python_version>="3.6"
-	statsd~=3.3;python_version~="3.5.0"
-	statsd<5;python_version>="3.6"
-	requests~=2.25;python_version~="3.5.0"
-	requests<3.0;python_version>"3.5"
-	contextvars~=2.4;python_version>="3.5" and python_version<"3.7"
+	Werkzeug<4
+	statsd<5
+	requests<3.0
 
 [options.extras_require]
 gunicorn =
-	gunicorn>=19.7.0;python_version>"3.6"
-	gunicorn==19.7.0,<21.0;python_version>="3.5" and python_version<"3.8"
+	gunicorn>=19.9.0
 raven = raven>=6.4.0
 celery =
-	celery~=4.4;python_version~="3.5.0"
-	celery>=4;python_version>"3.5"
+	celery>=4.3
 django =
-	django~=2.2;python_version~="3.5.0"
-	django<5;python_version>"3.5"
+	django<5
 prometheus =
-	prometheus-client~=0.7.0;python_version~="3.5.0"
-	prometheus-client<0.8;python_version>"3.5"
+	prometheus-client<0.8
 flask =
-	flask~=1.1;python_version~="3.5.0"
-	flask<4;python_version>"3.5"
-	blinker~=1.5;python_version~="3.5.0"
-	blinker<2;python_version>"3.5"
+	flask<4
+	blinker<2
 dev =
 	logging_tree>=1.9
 	pygments>=2.11
 	psutil>=5.9
 	objgraph>=3.5
 pg =
 	sqlparse>=0.4.2
-	psycopg2>=2.8,<3.0
+	psycopg2>=2.8.4,<3.0
 asyncio =
-	aiocontextvars==0.2.2;python_version>="3.5.3" and python_version<"3.7"
 gevent = gevent>=20.9.0
 
 [options.package_data]