diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2020-03-10 13:28:07 +0100 |
|---|---|---|
| committer | Valentin David <valentin.david@codethink.co.uk> | 2020-03-10 13:28:07 +0100 |
| commit | 1b9a09a9280478f1e65ab0ece175e8760e611d13 (patch) | |
| tree | b1ec29356da02a592dc96846e518cd6f3937bb8a | |
| parent | fc6b3f37f173fd19e5a2593b7bf8cce40f03c615 (diff) | |
| download | buildstream-1b9a09a9280478f1e65ab0ece175e8760e611d13.tar.gz | |
Enable testing on Python 3.8 (not in CI though).
| -rw-r--r-- | requirements/cov-requirements.in | 3 | ||||
| -rw-r--r-- | requirements/cov-requirements.txt | 5 | ||||
| -rw-r--r-- | requirements/dev-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 20 |
4 files changed, 16 insertions, 14 deletions
diff --git a/requirements/cov-requirements.in b/requirements/cov-requirements.in index 455b91ba6..1911f3506 100644 --- a/requirements/cov-requirements.in +++ b/requirements/cov-requirements.in @@ -1,2 +1,3 @@ -coverage == 4.4.0 +coverage == 4.4.0 ; python_version < '3.8' +coverage == 4.5.4 ; python_version >= '3.8' pytest-cov >= 2.5.0 diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt index 46c70432d..51bc2bd28 100644 --- a/requirements/cov-requirements.txt +++ b/requirements/cov-requirements.txt @@ -1,4 +1,5 @@ -coverage==4.4 +coverage==4.4.0; python_version < '3.8' +coverage==4.5.4; python_version >= '3.8' pytest-cov==2.7.1 ## The following requirements were added by pip freeze: atomicwrites==1.3.0 @@ -6,7 +7,7 @@ attrs==19.1.0 importlib-metadata==0.20 more-itertools==7.2.0 packaging==19.1 -pluggy==0.12.0 +pluggy==0.13.1 py==1.8.0 pyparsing==2.4.2 pytest==5.1.2 diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index e6f327284..dfc991e9b 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -19,7 +19,7 @@ lazy-object-proxy==1.4.2 mccabe==0.6.1 more-itertools==7.2.0 packaging==19.1 -pluggy==0.12.0 +pluggy==0.13.1 py==1.8.0 pyparsing==2.4.2 pytest-cache==1.0 @@ -2,7 +2,7 @@ # Tox global configuration # [tox] -envlist = py35,py36,py37 +envlist = py35,py36,py37,py38 skip_missing_interpreters = true # @@ -13,16 +13,16 @@ skip_missing_interpreters = true [testenv] commands = # Running with coverage reporting enabled - py{35,36,37}-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs} - py{35,36,37}-!nocover: mkdir -p .coverage-reports - py{35,36,37}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname} + py{35,36,37,38}-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs} + py{35,36,37,38}-!nocover: mkdir -p .coverage-reports + py{35,36,37,38}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname} # Running with coverage reporting disabled - py{35,36,37}-nocover: pytest --basetemp {envtmpdir} {posargs} + py{35,36,37,38}-nocover: pytest --basetemp {envtmpdir} {posargs} deps = - py{35,36,37}: -rrequirements/requirements.txt - py{35,36,37}: -rrequirements/dev-requirements.txt - py{35,36,37}: -rrequirements/plugin-requirements.txt + py{35,36,37,38}: -rrequirements/requirements.txt + py{35,36,37,38}: -rrequirements/dev-requirements.txt + py{35,36,37,38}: -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{35,36,37}: COVERAGE_FILE = {envtmpdir}/.coverage + py{35,36,37,38}: COVERAGE_FILE = {envtmpdir}/.coverage whitelist_externals = - py{35,36,37}: + py{35,36,37,38}: mv mkdir |