Merge 516c93e into 2691b5e

payu-org · May 14, 2020 · 7ff673f · 7ff673f
2 parents 2691b5e + 516c93e
commit 7ff673f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,7 @@ before_script:
 script:
     - payu list
     - pylint --extension-pkg-whitelist=netCDF4 -E payu
-    - if [[ $TRAVIS_PYTHON_VERSION == 3.6 || $TRAVIS_PYTHON_VERSION == 3.7 ]]; then PYTHONPATH=. coverage run --source payu -m py.test -s test; fi;
+    - if [[ $TRAVIS_PYTHON_VERSION == 3.6 || $TRAVIS_PYTHON_VERSION == 3.7 ]]; then PYTHONPATH=. pytest --cov=payu -s test; fi;
     - cd docs && make html
 after_success:
-    - coverage report -m
-    - coveralls
+    - if [[ $TRAVIS_PYTHON_VERSION == 3.6 || $TRAVIS_PYTHON_VERSION == 3.7 ]]; then coveralls; fi;
diff --git a/test/requirements_test.txt b/test/requirements_test.txt
@@ -1,9 +1,8 @@
-coverage == 3.7.1 ; python_version == '3.2'
-coverage ; python_version != '3.2'
+coverage
 coveralls
 pytest
 pylint
 mnctools
-scipy
 Sphinx
-numpy>=1.16.0
+pytest-cov
+numpy>=1.16.0