This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch juerg/ci in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
commit f72fdffeb7d01fc969804fcb47d69da9473a5645 Author: Jürg Billeter <[email protected]> AuthorDate: Fri Jul 26 10:23:04 2024 +0200 Sync Python support and CI images with BuildStream --- .github/common.env | 6 +++--- .github/compose/ci.docker-compose.yml | 14 +++++++------- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 6 +++--- setup.py | 2 +- tox.ini | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/common.env b/.github/common.env index 02eea32..166f1f6 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,5 +1,5 @@ # Shared common variables -CI_IMAGE_VERSION=master-488745436 -CI_TOXENV_ALL=py37,py38,py39,py310 -CI_TOXENV_MASTER=py37-bst-master,py38-bst-master,py39-bst-master,py310-bst-master +CI_IMAGE_VERSION=master-1361451963 +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 diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 1251079..1cf5903 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' x-tests-template: &tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:35-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:39-${CI_IMAGE_VERSION:-latest} command: tox -vvvvv -- --color=yes --integration environment: TOXENV: ${CI_TOXENV_ALL} @@ -22,17 +22,17 @@ x-tests-template: &tests-template services: - fedora-34: + fedora-38: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:38-${CI_IMAGE_VERSION:-latest} - fedora-35: + fedora-39: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:35-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:39-${CI_IMAGE_VERSION:-latest} - debian-10: + ubuntu-20.04: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:20.04-${CI_IMAGE_VERSION:-latest} # Ensure that tests also pass in the absence of a sandboxing tool fedora-missing-deps: diff --git a/.github/run-ci.sh b/.github/run-ci.sh index d4f60e3..117941b 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-10 fedora-34 fedora-35 fedora-missing-deps"; do + for test_name in "mypy fedora-38 fedora-39 fedora-missing-deps ubuntu-20.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 4e70b6e..b73831b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,10 +36,10 @@ jobs: # The names here should map to a valid service defined in # "../compose/ci.docker-compose.yml" test-name: - - debian-10 - - fedora-34 - - fedora-35 + - fedora-38 + - fedora-39 - fedora-missing-deps + - ubuntu-20.04 - lint - mypy diff --git a/setup.py b/setup.py index b2cc263..b5dad20 100755 --- a/setup.py +++ b/setup.py @@ -53,11 +53,11 @@ setup( "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Software Development :: Build Tools", ], description="A collection of plugins for BuildStream.", diff --git a/tox.ini b/tox.ini index 45042c1..334fd2d 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ # Tox global configuration # [tox] -envlist = py{37,38,39,310,311}-{bst-fixed,bst-master} +envlist = py{38,39,310,311,312}-{bst-fixed,bst-master} skip_missing_interpreters = true # @@ -54,14 +54,14 @@ passenv = # These keys are not inherited by any other sections # setenv = - py{37,38,39,310}: XDG_CACHE_HOME = {envtmpdir}/cache - py{37,38,39,310}: XDG_CONFIG_HOME = {envtmpdir}/config - py{37,38,39,310}: XDG_DATA_HOME = {envtmpdir}/share + 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 !master: BST_VERSION = 2.0.1 master: BST_VERSION = master whitelist_externals = - py{37,38,39,310}: + py{38,39,310,311,312}: mv mkdir
