summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-02-26 17:24:43 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-02-28 18:12:19 +0900
commitefaff945e0c8aa410bbab05576f7621de3578bd5 (patch)
tree42a82967489fe1422eb4d7ccc9913aeee9023bcb
parent153f81a10dcf558fcc4a7a796d1a3f48c21d9be9 (diff)
downloadbuildstream-efaff945e0c8aa410bbab05576f7621de3578bd5.tar.gz
tox.ini / requirements: Separated coverage requirements
Since coverage is optional, lets make it really optional.
-rw-r--r--requirements/cov-requirements.in2
-rw-r--r--requirements/cov-requirements.txt11
-rw-r--r--requirements/dev-requirements.in2
-rw-r--r--requirements/dev-requirements.txt24
-rw-r--r--tox.ini2
5 files changed, 27 insertions, 14 deletions
diff --git a/requirements/cov-requirements.in b/requirements/cov-requirements.in
new file mode 100644
index 000000000..455b91ba6
--- /dev/null
+++ b/requirements/cov-requirements.in
@@ -0,0 +1,2 @@
+coverage == 4.4.0
+pytest-cov >= 2.5.0
diff --git a/requirements/cov-requirements.txt b/requirements/cov-requirements.txt
new file mode 100644
index 000000000..843df85f3
--- /dev/null
+++ b/requirements/cov-requirements.txt
@@ -0,0 +1,11 @@
+coverage==4.4
+pytest-cov==2.6.1
+## The following requirements were added by pip freeze:
+atomicwrites==1.3.0
+attrs==18.2.0
+more-itertools==6.0.0
+pathlib2==2.3.3
+pluggy==0.9.0
+py==1.8.0
+pytest==4.3.0
+six==1.12.0
diff --git a/requirements/dev-requirements.in b/requirements/dev-requirements.in
index 9edb23423..8b871073b 100644
--- a/requirements/dev-requirements.in
+++ b/requirements/dev-requirements.in
@@ -1,8 +1,6 @@
-coverage == 4.4.0
pylint
pycodestyle
pytest >= 3.9
-pytest-cov >= 2.5.0
pytest-datafiles >= 2.0
pytest-env
pytest-xdist
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index c34f6db12..d8039c316 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,25 +1,25 @@
-coverage==4.4
pylint==2.2.2
-pycodestyle==2.4.0
-pytest==4.0.2
-pytest-cov==2.6.1
+pycodestyle==2.5.0
+pytest==4.3.0
pytest-datafiles==2.0
pytest-env==0.6.2
-pytest-xdist==1.25.0
+pytest-xdist==1.26.1
pytest-timeout==1.3.3
pyftpdlib==1.5.4
## The following requirements were added by pip freeze:
apipkg==1.5
astroid==2.1.0
-atomicwrites==1.2.1
+atomicwrites==1.3.0
attrs==18.2.0
execnet==1.5.0
-isort==4.3.4
+isort==4.3.9
lazy-object-proxy==1.3.1
mccabe==0.6.1
-more-itertools==5.0.0
-pluggy==0.8.0
-py==1.7.0
-pytest-forked==0.2
+more-itertools==6.0.0
+pathlib2==2.3.3
+pluggy==0.9.0
+py==1.8.0
+pytest-forked==1.0.2
six==1.12.0
-wrapt==1.10.11
+typed-ast==1.3.1
+wrapt==1.11.1
diff --git a/tox.ini b/tox.ini
index 97de44602..6fced4f51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ commands =
deps =
-rrequirements/requirements.txt
-rrequirements/dev-requirements.txt
+ -rrequirements/cov-requirements.txt
-rrequirements/plugin-requirements.txt
passenv =
BST_FORCE_BACKEND
@@ -44,6 +45,7 @@ commands =
deps =
-rrequirements/requirements.txt
-rrequirements/dev-requirements.txt
+ -rrequirements/cov-requirements.txt
setenv =
COVERAGE_FILE = {toxinidir}/.coverage-reports/.coverage