Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/common.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Shared common variables

CI_IMAGE_VERSION=master-2779642792
CI_TOXENV_MAIN=py310,py311,py312,py313,py314
CI_TOXENV_PLUGINS=py310-plugins,py311-plugins,py312-plugins,py313-plugins,py314-plugins
CI_IMAGE_VERSION=master-2783218587
CI_TOXENV_MAIN=py310,py311,py312,py313,py314,py315
CI_TOXENV_PLUGINS=py310-plugins,py311-plugins,py312-plugins,py313-plugins,py314-plugins,py315-plugins
CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}"
9 changes: 9 additions & 0 deletions .github/compose/ci.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ services:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:44-${CI_IMAGE_VERSION:-latest}

fedora-45:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:45-${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}
Expand Down Expand Up @@ -116,3 +120,8 @@ services:
<<: *tests-template
image: quay.io/pypa/manylinux_2_28_x86_64
command: .github/wheel-helpers/test-wheel-manylinux.sh cp314-cp314 /opt/python/cp314-cp314/bin/python3

wheels-manylinux_2_28-cp315:
<<: *tests-template
image: quay.io/pypa/manylinux_2_28_x86_64
command: .github/wheel-helpers/test-wheel-manylinux.sh cp315-cp315 /opt/python/cp315-cp315/bin/python3
2 changes: 1 addition & 1 deletion .github/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function runServiceTest() {


if [ -z "${test_names}" ]; then
for test_name in mypy debian-12 debian-13 fedora-44 fedora-missing-deps ubuntu-22.04; do
for test_name in mypy debian-12 debian-13 fedora-44 fedora-45 fedora-missing-deps ubuntu-22.04; do
if ! runTest "${test_name}"; then
echo "Tests failed"
exit 1
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
- debian-12
- debian-13
- fedora-44
- fedora-45
- fedora-missing-deps
- ubuntu-22.04
- lint
Expand Down Expand Up @@ -135,7 +136,7 @@ jobs:
run: ${GITHUB_WORKSPACE}/.github/wheel-helpers/fetch-latest-buildbox-release.sh

- name: Build wheels
run: pipx run cibuildwheel==v3.1.4
run: pipx run cibuildwheel~=4.0

- uses: actions/upload-artifact@v7
with:
Expand All @@ -157,6 +158,7 @@ jobs:
- wheels-manylinux_2_28-cp312
- wheels-manylinux_2_28-cp313
- wheels-manylinux_2_28-cp314
- wheels-manylinux_2_28-cp315

steps:
- uses: actions/checkout@v7
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: ${GITHUB_WORKSPACE}/.github/wheel-helpers/fetch-latest-buildbox-release.sh

- name: Build wheels
run: pipx run cibuildwheel==v3.1.4
run: pipx run cibuildwheel~=4.0

- uses: actions/upload-artifact@v7
with:
Expand All @@ -94,6 +94,7 @@ jobs:
- wheels-manylinux_2_28-cp312
- wheels-manylinux_2_28-cp313
- wheels-manylinux_2_28-cp314
- wheels-manylinux_2_28-cp315

steps:
- uses: actions/checkout@v7
Expand Down
2 changes: 1 addition & 1 deletion requirements/cov-requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coverage >= 6
coverage >= 7.15
pytest-cov >= 2.5.0
pytest >= 6.0.1
Cython
2 changes: 1 addition & 1 deletion requirements/cov-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
coverage==7.13.5
coverage==7.15.4
pytest-cov==7.1.0
pytest==9.0.3
Cython==3.2.4
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ def files_from_module(modname):
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Topic :: Software Development :: Build Tools",
],
description="A framework for modelling build pipelines in YAML",
Expand Down
40 changes: 20 additions & 20 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{310,311,312,313,314}
envlist = py{310,311,312,313,314,315}
skip_missing_interpreters = true
isolated_build = true

Expand All @@ -33,30 +33,30 @@ BST_PLUGINS_VERSION = 79649529cffb695d0d22195ed9a4910c80ca6907 # 2.5.0
[testenv]
usedevelop =
# This is required by Cython in order to get coverage for cython files.
py{310,311,312,313,314}-!nocover: True
py{310,311,312,313,314,315}-!nocover: True

commands =
# Running with coverage reporting enabled
py{310,311,312,313,314}-!plugins-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
py{310,311,312,313,314,315}-!plugins-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
# Running with coverage reporting disabled
py{310,311,312,313,314}-!plugins-nocover: pytest --basetemp {envtmpdir} {posargs}
py{310,311,312,313,314,315}-!plugins-nocover: pytest --basetemp {envtmpdir} {posargs}
# Running external plugins tests with coverage reporting enabled
py{310,311,312,313,314}-plugins-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc --plugins {posargs}
py{310,311,312,313,314,315}-plugins-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc --plugins {posargs}
# Running external plugins tests with coverage disabled
py{310,311,312,313,314}-plugins-nocover: pytest --basetemp {envtmpdir} --plugins {posargs}
py{310,311,312,313,314,315}-plugins-nocover: pytest --basetemp {envtmpdir} --plugins {posargs}
commands_post:
py{310,311,312,313,314}-!nocover: mkdir -p .coverage-reports
py{310,311,312,313,314}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
py{310,311,312,313,314,315}-!nocover: mkdir -p .coverage-reports
py{310,311,312,313,314,315}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
deps =
py{310,311,312,313,314}: -rrequirements/requirements.txt
py{310,311,312,313,314}: -rrequirements/dev-requirements.txt
py{310,311,312,313,314}: git+https://github.com/apache/buildstream-plugins.git@{env:BST_PLUGINS_VERSION:{[config]BST_PLUGINS_VERSION}}
py{310,311,312,313,314,315}: -rrequirements/requirements.txt
py{310,311,312,313,314,315}: -rrequirements/dev-requirements.txt
py{310,311,312,313,314,315}: git+https://github.com/apache/buildstream-plugins.git@{env:BST_PLUGINS_VERSION:{[config]BST_PLUGINS_VERSION}}

# Install local sample plugins for testing pip plugin origins
py{310,311,312,313,314}: {toxinidir}/tests/plugins/sample-plugins
py{310,311,312,313,314,315}: {toxinidir}/tests/plugins/sample-plugins

# Install external plugins for plugin tests
py{310,311,312,313,314}-plugins: git+https://gitlab.com/buildstream/buildstream-plugins-community.git@{env:BST_PLUGINS_COMMUNITY_VERSION:{[config]BST_PLUGINS_COMMUNITY_VERSION}}#egg=bst_plugins_community[deb]
py{310,311,312,313,314,315}-plugins: git+https://gitlab.com/buildstream/buildstream-plugins-community.git@{env:BST_PLUGINS_COMMUNITY_VERSION:{[config]BST_PLUGINS_COMMUNITY_VERSION}}#egg=bst_plugins_community[deb]

# Only require coverage and pytest-cov when using it
!nocover: -rrequirements/cov-requirements.txt
Expand Down Expand Up @@ -84,18 +84,18 @@ passenv =
# These keys are not inherited by any other sections
#
setenv =
py{310,311,312,313,314}: COVERAGE_FILE = {envtmpdir}/.coverage
py{310,311,312,313,314}: BST_TEST_HOME = {envtmpdir}
py{310,311,312,313,314}: BST_TEST_XDG_CACHE_HOME = {envtmpdir}/cache
py{310,311,312,313,314}: BST_TEST_XDG_CONFIG_HOME = {envtmpdir}/config
py{310,311,312,313,314}: BST_TEST_XDG_DATA_HOME = {envtmpdir}/share
py{310,311,312,313,314,315}: COVERAGE_FILE = {envtmpdir}/.coverage
py{310,311,312,313,314,315}: BST_TEST_HOME = {envtmpdir}
py{310,311,312,313,314,315}: BST_TEST_XDG_CACHE_HOME = {envtmpdir}/cache
py{310,311,312,313,314,315}: BST_TEST_XDG_CONFIG_HOME = {envtmpdir}/config
py{310,311,312,313,314,315}: BST_TEST_XDG_DATA_HOME = {envtmpdir}/share

# This is required to get coverage for Cython
py{310,311,312,313,314}-!nocover: BST_CYTHON_TRACE = 1
py{310,311,312,313,314,315}-!nocover: BST_CYTHON_TRACE = 1
randomized: PYTEST_ADDOPTS="--random-order-bucket=global"

allowlist_externals =
py{310,311,312,313,314}:
py{310,311,312,313,314,315}:
mv
mkdir

Expand Down
Loading