diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-12 13:03:23 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-08-12 13:03:23 +0000 |
| commit | 84d03bb59399d92f465b673b2f1e9850e242ba0c (patch) | |
| tree | 8dc005429254ddbb1bdd6ae400726b79cef62afa | |
| parent | ca883d3e7d0d9ac0e1e4f60991f74b30a8ab43de (diff) | |
| parent | 30d7e9ace1a2d2c60b9cbdc96f6a177b9f81d71d (diff) | |
| download | buildstream-84d03bb59399d92f465b673b2f1e9850e242ba0c.tar.gz | |
Merge branch 'juerg/ci' into 'master'
CI fixes for Python 3.8 and Breezy
See merge request BuildStream/buildstream!2024
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | src/buildstream/testing/_utils/site.py | 6 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5fe3daff..864bff1d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ variables: INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" PYTEST_ARGS: "--color=yes --integration -n 2" TEST_COMMAND: "tox -- ${PYTEST_ARGS}" - TOXENV: py36, py37, py38, py36-plugins, py37-plugins, py38-plugins + TOXENV: py36, py37, py38-nocover, py36-plugins, py37-plugins, py38-plugins-nocover COVERAGE_PREFIX: "${CI_JOB_NAME}." diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py index d8ace859b..705419f58 100644 --- a/src/buildstream/testing/_utils/site.py +++ b/src/buildstream/testing/_utils/site.py @@ -38,7 +38,11 @@ except ProgramNotFoundError: try: BZR = utils.get_host_tool("bzr") # type: Optional[str] HAVE_BZR = True - BZR_ENV = {"BZR_EMAIL": "Testy McTesterson <testy.mctesterson@example.com>"} + # Breezy 3.0 supports `BRZ_EMAIL` but not `BZR_EMAIL` + BZR_ENV = { + "BZR_EMAIL": "Testy McTesterson <testy.mctesterson@example.com>", + "BRZ_EMAIL": "Testy McTesterson <testy.mctesterson@example.com>", + } except ProgramNotFoundError: BZR = None HAVE_BZR = False @@ -2,7 +2,7 @@ # Tox global configuration # [tox] -envlist = py{36,37,38} +envlist = py{36,37},py38-nocover skip_missing_interpreters = true isolated_build = true |