From 98d1c145bc44db926214b8725d503a4f83fe4f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 10 Jan 2025 15:40:10 +0100 Subject: [PATCH 1/7] requirements: Add setuptools to test-requirements This is required for `pip` tests to pass with BuildStream 2.4.0, which removed `setuptools` from the base requirements. --- requirements/test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index f922730..646c0bd 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -8,4 +8,5 @@ pylint pycodestyle pyftpdlib responses +setuptools wheel From b58abc5111e8c77944916bdd3beed4f2ba521942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 20 Dec 2024 13:59:16 +0100 Subject: [PATCH 2/7] .github/run-ci.sh: Update last reference of Ubuntu 20.04 to 22.04 --- .github/run-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/run-ci.sh b/.github/run-ci.sh index 3b3bb36..ce31ab5 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 fedora-40 fedora-missing-deps ubuntu-20.04"; do + for test_name in "mypy debian-11 fedora-40 fedora-missing-deps ubuntu-22.04"; do if ! runTest "${test_name}"; then echo "Tests failed" exit 1 From 90ea905a324daf041d16a5ef9cbcdb7ed29ba0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 20 Dec 2024 14:02:20 +0100 Subject: [PATCH 3/7] Drop support for Python 3.8 Python 3.8 is no longer maintained upstream and some Python packages have dropped support for it. --- .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 91f1cb5..e9d9f0a 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables CI_IMAGE_VERSION=master-1571408207 -CI_TOXENV_ALL=py38,py39,py310,py311,py312 -CI_TOXENV_MASTER=py38-bst-master,py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master +CI_TOXENV_ALL=py39,py310,py311,py312 +CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master diff --git a/setup.py b/setup.py index 5417244..61a9ca9 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.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/tox.ini b/tox.ini index 5b97c50..22c69e0 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ # Tox global configuration # [tox] -envlist = py{38,39,310,311,312}-{bst-fixed,bst-master} +envlist = py{39,310,311,312}-{bst-fixed,bst-master} skip_missing_interpreters = true # @@ -55,14 +55,14 @@ passenv = # These keys are not inherited by any other sections # setenv = - py{38,39,310,311,312}: XDG_CACHE_HOME = {envtmpdir}/cache - py{38,39,310,311,312}: XDG_CONFIG_HOME = {envtmpdir}/config - py{38,39,310,311,312}: XDG_DATA_HOME = {envtmpdir}/share + py{39,310,311,312}: XDG_CACHE_HOME = {envtmpdir}/cache + py{39,310,311,312}: XDG_CONFIG_HOME = {envtmpdir}/config + py{39,310,311,312}: XDG_DATA_HOME = {envtmpdir}/share !master: BST_VERSION = 2.2.1 master: BST_VERSION = master allowlist_externals = - py{38,39,310,311,312}: + py{39,310,311,312}: mv mkdir ./tests/bzr_wrapper From 06a4522be66713b857303eb91cf83599aa1b0a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 20 Dec 2024 14:04:50 +0100 Subject: [PATCH 4/7] tox.ini: Update mypy to match buildstream --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 22c69e0..0603b85 100644 --- a/tox.ini +++ b/tox.ini @@ -106,7 +106,7 @@ skip_install = True commands = mypy {posargs} deps = - mypy==1.11.0 + mypy==1.13.0 types-protobuf types-python-dateutil types-setuptools From 8971237f0e6b45383fb9dd4215f20742d7e39982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 20 Dec 2024 14:07:00 +0100 Subject: [PATCH 5/7] Add support for Python 3.13 --- .github/common.env | 4 ++-- setup.py | 1 + tox.ini | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/common.env b/.github/common.env index e9d9f0a..3c65591 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables CI_IMAGE_VERSION=master-1571408207 -CI_TOXENV_ALL=py39,py310,py311,py312 -CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master +CI_TOXENV_ALL=py39,py310,py311,py312,py313 +CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master diff --git a/setup.py b/setup.py index 61a9ca9..55bc4d7 100755 --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Software Development :: Build Tools", ], description="A collection of plugins for BuildStream.", diff --git a/tox.ini b/tox.ini index 0603b85..a248d6e 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ # Tox global configuration # [tox] -envlist = py{39,310,311,312}-{bst-fixed,bst-master} +envlist = py{39,310,311,312,313}-{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}: XDG_CACHE_HOME = {envtmpdir}/cache - py{39,310,311,312}: XDG_CONFIG_HOME = {envtmpdir}/config - py{39,310,311,312}: XDG_DATA_HOME = {envtmpdir}/share + py{39,310,311,312,313}: XDG_CACHE_HOME = {envtmpdir}/cache + py{39,310,311,312,313}: XDG_CONFIG_HOME = {envtmpdir}/config + py{39,310,311,312,313}: XDG_DATA_HOME = {envtmpdir}/share !master: BST_VERSION = 2.2.1 master: BST_VERSION = master allowlist_externals = - py{39,310,311,312}: + py{39,310,311,312,313}: mv mkdir ./tests/bzr_wrapper From a1200c8121a412cd0c0e04b383226241a5f42049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 20 Dec 2024 14:08:21 +0100 Subject: [PATCH 6/7] ci: Run tests also on Fedora 41 This extends test coverage to Python 3.13. --- .github/compose/ci.docker-compose.yml | 4 ++++ .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index f22b14b..6f69d52 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -30,6 +30,10 @@ services: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest} + fedora-41: + <<: *tests-template + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} + ubuntu-22.04: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:22.04-${CI_IMAGE_VERSION:-latest} diff --git a/.github/run-ci.sh b/.github/run-ci.sh index ce31ab5..eebbbda 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 fedora-40 fedora-missing-deps ubuntu-22.04"; do + for test_name in "mypy debian-11 fedora-40 fedora-41 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 d76c512..6cd9c20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: test-name: - debian-11 - fedora-40 + - fedora-41 - fedora-missing-deps - ubuntu-22.04 - lint From 56667baa2e1aa88b5bc9858528b743bf71bf98d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 10 Jan 2025 15:49:55 +0100 Subject: [PATCH 7/7] tox.ini: Test with latest BuildStream release 2.4.0 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a248d6e..3ecd216 100644 --- a/tox.ini +++ b/tox.ini @@ -58,7 +58,7 @@ setenv = py{39,310,311,312,313}: XDG_CACHE_HOME = {envtmpdir}/cache py{39,310,311,312,313}: XDG_CONFIG_HOME = {envtmpdir}/config py{39,310,311,312,313}: XDG_DATA_HOME = {envtmpdir}/share - !master: BST_VERSION = 2.2.1 + !master: BST_VERSION = 2.4.0 master: BST_VERSION = master allowlist_externals =