You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ju...@apache.org on 2022/01/14 15:09:03 UTC
[buildstream] branch bst-1 updated: bst-1: run test in Fedora 35 as well
This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a commit to branch bst-1
in repository https://gitbox.apache.org/repos/asf/buildstream.git
The following commit(s) were added to refs/heads/bst-1 by this push:
new 4ede5e3 bst-1: run test in Fedora 35 as well
new eb2ef7a Merge pull request #1553 from jjardon/jjardon/bst-1-fedora-35
4ede5e3 is described below
commit 4ede5e3dedf15e17646bad7027466d59321cbd55
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Fri Jan 7 19:38:25 2022 +0000
bst-1: run test in Fedora 35 as well
---
.github/common.env | 4 ++--
.github/compose/ci.docker-compose.yml | 4 ++++
.github/run-ci.sh | 1 +
.github/workflows/ci.yml | 1 +
buildstream/plugins/sources/pip.py | 1 +
tox.ini | 20 ++++++++++----------
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/.github/common.env b/.github/common.env
index 0929e82..32d7fa7 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,5 +1,5 @@
# Shared common variables
-CI_IMAGE_VERSION=master-359695845
-CI_TOXENV_MAIN=py36-nocover,py37-nocover,py38-nocover,py39-nocover
+CI_IMAGE_VERSION=master-443158932
+CI_TOXENV_MAIN=py36-nocover,py37-nocover,py38-nocover,py39-nocover,py310-nocover
CI_TOXENV_ALL="${CI_TOXENV_MAIN}"
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index 1505528..3b7fa66 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -26,6 +26,10 @@ services:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
+ fedora-35:
+ <<: *tests-template
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:35-${CI_IMAGE_VERSION:-latest}
+
debian-10:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${CI_IMAGE_VERSION:-latest}
diff --git a/.github/run-ci.sh b/.github/run-ci.sh
index 1ff5174..02412e5 100755
--- a/.github/run-ci.sh
+++ b/.github/run-ci.sh
@@ -68,6 +68,7 @@ if [ -z "${test_names}" ]; then
runTest "lint"
runTest "debian-10"
runTest "fedora-34"
+ runTest "fedora-35"
runTest "ubuntu-18.04"
runTest "centos-7.7.1908"
else
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12e3eaa..85ee431 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,7 @@ jobs:
test-name:
- debian-10
- fedora-34
+ - fedora-35
- ubuntu-18.04
- centos-7.7.1908
- lint
diff --git a/buildstream/plugins/sources/pip.py b/buildstream/plugins/sources/pip.py
index 6824bd3..6ea8476 100644
--- a/buildstream/plugins/sources/pip.py
+++ b/buildstream/plugins/sources/pip.py
@@ -92,6 +92,7 @@ _PYTHON_VERSIONS = [
'python3.7',
'python3.8',
'python3.9',
+ 'python3.10',
]
# List of allowed extensions taken from
diff --git a/tox.ini b/tox.ini
index a342353..5351aa5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
# Tox global configuration
#
[tox]
-envlist = py36-nocover,py37-nocover,py38-nocover,py39-nocover
+envlist = py36-nocover,py37-nocover,py38-nocover,py39-nocover,py310-nocover
skip_missing_interpreters = true
#
@@ -13,16 +13,16 @@ skip_missing_interpreters = true
[testenv]
commands =
# Running with coverage reporting enabled
- py{36,37,38,39}-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
- py{36,37,38,39}-!nocover: mkdir -p .coverage-reports
- py{36,37,38,39}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
+ py{36,37,38,39,310}-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
+ py{36,37,38,39,310}-!nocover: mkdir -p .coverage-reports
+ py{36,37,38,39,310}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
# Running with coverage reporting disabled
- py{36,37,38,39}-nocover: pytest --basetemp {envtmpdir} {posargs}
+ py{36,37,38,39,310}-nocover: pytest --basetemp {envtmpdir} {posargs}
deps =
- py{36,37,38,39}: -rrequirements/requirements.txt
- py{36,37,38,39}: -rrequirements/dev-requirements.txt
- py{36,37,38,39}: -rrequirements/plugin-requirements.txt
+ py{36,37,38,39,310}: -rrequirements/requirements.txt
+ py{36,37,38,39,310}: -rrequirements/dev-requirements.txt
+ py{36,37,38,39,310}: -rrequirements/plugin-requirements.txt
# Only require coverage and pytest-cov when using it
!nocover: -rrequirements/cov-requirements.txt
@@ -35,9 +35,9 @@ passenv =
# These keys are not inherited by any other sections
#
setenv =
- py{36,37,38,39}: COVERAGE_FILE = {envtmpdir}/.coverage
+ py{36,37,38,39,310}: COVERAGE_FILE = {envtmpdir}/.coverage
whitelist_externals =
- py{36,37,38,39}:
+ py{36,37,38,39,310}:
mv
mkdir