Move pytest dependency check outside of flake8 build

lesteve · lesteve · commit 613ebf5858af · 2017-11-09T10:56:15.000+01:00
with an attempt to make codecov happy
diff --git a/.travis.yml b/.travis.yml
@@ -42,10 +42,10 @@ matrix:
     - env: DISTRIB="conda" PYTHON_VERSION="3.6.2" INSTALL_MKL="true"
            NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1" PANDAS_VERSION="0.20.3"
            CYTHON_VERSION="0.26.1" COVERAGE=true
+           CHECK_PYTEST_SOFT_DEPENDENCY="true"
       if: type != cron
     # flake8 linting on diff wrt common ancestor with upstream/master
-    # and check soft dependency on pytest
-    - env: RUN_FLAKE8="true" CHECK_PYTEST_SOFT_DEPENDENCY="true"
+    - env: RUN_FLAKE8="true"
            SKIP_TESTS="true" DISTRIB="conda" PYTHON_VERSION="3.5"
            INSTALL_MKL="true" NUMPY_VERSION="1.13.1" SCIPY_VERSION="0.19.1"
            CYTHON_VERSION="0.26.1"
diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh
@@ -63,5 +63,10 @@ fi
 if [[ "$CHECK_PYTEST_SOFT_DEPENDENCY" == "true" ]]; then
     conda remove -y py pytest || echo "pytest not found by conda"
     pip uninstall -y py pytest || echo "pytest not found by pip"
-    PYTHONPATH=. python sklearn/utils/tests/test_estimator_checks.py
+    if [[ "$COVERAGE" == "true" ]]; then
+        CMD="coverage run -a"
+    else
+        CMD="python"
+    fi
+    $CMD sklearn/utils/tests/test_estimator_checks.py
 fi
