Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/common.env
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions .github/compose/ci.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion .github/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

#
Expand Down Expand Up @@ -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
Expand Down
Loading