Add pytest build on Travis

lesteve · lesteve · commit abc27875498e · 2017-02-14T14:53:10.000+01:00
and tweak pytest settings in setup.cfg
diff --git a/.travis.yml b/.travis.yml
@@ -36,6 +36,11 @@ env:
     - DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
       NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1"
       CYTHON_VERSION="0.25.2"
+    # This environment use pytest to run the tests. It uses the newest
+    # supported anaconda env. It also runs tests requiring Pandas.
+    - USE_PYTEST="true" DISTRIB="conda" PYTHON_VERSION="3.6" INSTALL_MKL="true"
+      NUMPY_VERSION="1.11.2" SCIPY_VERSION="0.18.1" PANDAS_VERSION="0.19.1"
+      CYTHON_VERSION="0.25.2"
     # flake8 linting on diff wrt common ancestor with upstream/master
     - RUN_FLAKE8="true" SKIP_TESTS="true"
       DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
diff --git a/build_tools/travis/install.sh b/build_tools/travis/install.sh
@@ -51,13 +51,13 @@ if [[ "$DISTRIB" == "conda" ]]; then
     # Configure the conda environment and put it in the path using the
     # provided versions
     if [[ "$INSTALL_MKL" == "true" ]]; then
-        conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
+        conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
             numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
             mkl cython=$CYTHON_VERSION \
             ${PANDAS_VERSION+pandas=$PANDAS_VERSION}
             
     else
-        conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
+        conda create -n testenv --yes python=$PYTHON_VERSION pip nose pytest \
             numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
             nomkl cython=$CYTHON_VERSION \
             ${PANDAS_VERSION+pandas=$PANDAS_VERSION}
diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh
@@ -21,6 +21,11 @@ except ImportError:
 python -c "import multiprocessing as mp; print('%d CPUs' % mp.cpu_count())"
 
 run_tests() {
+    if [[ "$USE_PYTEST" == "true" ]]; then
+        TEST_CMD="pytest --pyargs"
+    else
+        TEST_CMD="nosetests --with-coverage" # --with-timer --timer-top-n 20"
+    fi
     # Get into a temp directory to run test from the installed scikit learn and
     # check if we do not leave artifacts
     mkdir -p $TEST_DIR
@@ -34,10 +39,9 @@ run_tests() {
     export SKLEARN_SKIP_NETWORK_TESTS=1
 
     if [[ "$COVERAGE" == "true" ]]; then
-        nosetests -s --with-coverage --with-timer --timer-top-n 20 sklearn
-    else
-        nosetests -s --with-timer --timer-top-n 20 sklearn
+        TEST_CMD="$TEST_CMD --with-coverage"
     fi
+    $TEST_CMD sklearn
 
     # Test doc
     cd $OLDPWD
diff --git a/setup.cfg b/setup.cfg
@@ -22,6 +22,13 @@ doctest-fixtures = _fixture
 ignore-files=^setup\.py$
 #doctest-options = +ELLIPSIS,+NORMALIZE_WHITESPACE
 
+[tool:pytest]
+# disable-pytest-warnings should be removed once we drop nose and we
+# replace yield test by parametrize
+addopts =
+    --doctest-modules
+    --disable-pytest-warnings
+
 [wheelhouse_uploader]
 artifact_indexes=
     # OSX wheels built by travis (only for specific tags):
