Browse Source

create a separate requirements file for travis - without pytest-benchmark

pytest-benchmark (and its dependency "statistics") needs py 3.3+.

we do not want to run benchmarks on travis anyway, but even its presence
makes trouble due to this, so we just remove it from there again.

as --benchmark-skip is also removed from tox configuration, this means benchmarks
are run by default when pytest-benchmark is installed.
Thomas Waldmann 9 years ago
parent
commit
9dccc809a9
3 changed files with 7 additions and 2 deletions
  1. 1 1
      .travis/install.sh
  2. 5 0
      requirements.d/travis.txt
  3. 1 1
      tox.ini

+ 1 - 1
.travis/install.sh

@@ -43,6 +43,6 @@ fi
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
-pip install -r requirements.d/development.txt
+pip install -r requirements.d/travis.txt
 pip install codecov
 pip install -e .

+ 5 - 0
requirements.d/travis.txt

@@ -0,0 +1,5 @@
+tox
+mock
+pytest
+pytest-cov<2.0.0
+Cython

+ 1 - 1
tox.ini

@@ -11,6 +11,6 @@ changedir = {toxworkdir}
 deps =
      -rrequirements.d/development.txt
      attic
-commands = py.test --cov=borg --benchmark-skip --pyargs {posargs:borg.testsuite}
+commands = py.test --cov=borg --pyargs {posargs:borg.testsuite}
 # fakeroot -u needs some env vars:
 passenv = *