From 11aaf4bfae934d55fea75d2487ee69472f1df3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 21 Nov 2025 13:27:16 +0100 Subject: [PATCH 1/2] ci: Don't run tests on Debian 11 It uses Python 3.9, which is no longer maintained upstream. --- .github/compose/ci.docker-compose.yml | 4 ---- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index ce8b3f5..d073f18 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -22,10 +22,6 @@ x-tests-template: &tests-template services: - debian-11: - <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:11-${CI_IMAGE_VERSION:-latest} - debian-12: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:12-${CI_IMAGE_VERSION:-latest} diff --git a/.github/run-ci.sh b/.github/run-ci.sh index a8e302f..caae267 100755 --- a/.github/run-ci.sh +++ b/.github/run-ci.sh @@ -67,7 +67,7 @@ function runTest() { if [ -z "${test_names}" ]; then - for test_name in "mypy debian-11 debian-12 debian-13 fedora-42 fedora-43 fedora-missing-deps ubuntu-22.04"; do + for test_name in "mypy debian-12 debian-13 fedora-42 fedora-43 fedora-missing-deps ubuntu-22.04"; do if ! runTest "${test_name}"; then echo "Tests failed" exit 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2341374..7f6b4d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,6 @@ jobs: # The names here should map to a valid service defined in # "../compose/ci.docker-compose.yml" test-name: - - debian-11 - debian-12 - debian-13 - fedora-42 From 163aa15ee82ccd857220f6a1908fbc7f5b63a6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 21 Nov 2025 13:29:47 +0100 Subject: [PATCH 2/2] Drop support for Python 3.9 Python 3.9 is no longer maintained upstream. --- .github/common.env | 4 ++-- setup.py | 1 - tox.ini | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/common.env b/.github/common.env index 70890b4..2a04ad9 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables CI_IMAGE_VERSION=master-2106151116 -CI_TOXENV_ALL=py39,py310,py311,py312,py313,py314 -CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master,py314-bst-master +CI_TOXENV_ALL=py310,py311,py312,py313,py314 +CI_TOXENV_MASTER=py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master,py314-bst-master diff --git a/setup.py b/setup.py index 576c4e6..b14cde5 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", diff --git a/tox.ini b/tox.ini index 8c71bf6..d59da73 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ # Tox global configuration # [tox] -envlist = py{39,310,311,312,313,314}-{bst-fixed,bst-master} +envlist = py{310,311,312,313,314}-{bst-fixed,bst-master} skip_missing_interpreters = true # @@ -55,14 +55,14 @@ passenv = # These keys are not inherited by any other sections # setenv = - py{39,310,311,312,313,314}: XDG_CACHE_HOME = {envtmpdir}/cache - py{39,310,311,312,313,314}: XDG_CONFIG_HOME = {envtmpdir}/config - py{39,310,311,312,313,314}: XDG_DATA_HOME = {envtmpdir}/share + py{310,311,312,313,314}: XDG_CACHE_HOME = {envtmpdir}/cache + py{310,311,312,313,314}: XDG_CONFIG_HOME = {envtmpdir}/config + py{310,311,312,313,314}: XDG_DATA_HOME = {envtmpdir}/share !master: BST_VERSION = 2.6.0 master: BST_VERSION = master allowlist_externals = - py{39,310,311,312,313,314}: + py{310,311,312,313,314}: mv mkdir {toxinidir}/tests/bzr_wrapper