NOSE_ARGS -> TEST_ARGS

GGordonGordon · Feb 10, 2017 · 59e2be9 · 59e2be9
1 parent 03695aa
commit 59e2be9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_osx"
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - BUILD_TYPE=conda
         - JOB_TAG=_OSX
         - TRAVIS_PYTHON_VERSION=3.5
@@ -42,7 +42,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow_nnet_LOCALE"
-        - NOSE_ARGS="--only-slow --skip-network"
+        - TEST_ARGS="--only-slow --skip-network"
         - LOCALE_OVERRIDE="zh_CN.UTF-8"
         - FULL_DEPS=true
         - JOB_TAG=_LOCALE
@@ -56,7 +56,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow"
-        - NOSE_ARGS="--skip-slow"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - CLIPBOARD_GUI=gtk2
         - LINT=true
@@ -70,7 +70,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_nslow"
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - COVERAGE=true
@@ -84,7 +84,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.6
         - JOB_NAME: "36"
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
       addons:
         apt:
@@ -96,7 +96,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
         - INSTALL_TEST=true
         - JOB_TAG=_COMPAT
@@ -112,7 +112,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="--only-slow --skip-network"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
@@ -122,7 +122,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="--skip-slow"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
@@ -133,7 +133,7 @@ matrix:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_nslow"
         - LOCALE_OVERRIDE="zh_CN.UTF-8"
-        - NOSE_ARGS="--skip-slow"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_nslow"
@@ -149,7 +149,7 @@ matrix:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="--only-slow --skip-network"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_slow"
@@ -164,7 +164,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_numpy_dev"
         - JOB_TAG=_NUMPY_DEV
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
         - CACHE_NAME="35_numpy_dev"
         - USE_CACHE=true
@@ -179,7 +179,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="C"
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true
@@ -199,7 +199,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="--only-slow --skip-network"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
@@ -208,7 +208,7 @@ matrix:
         - PYTHON_VERSION=3.4
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="--only-slow --skip-network"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - CACHE_NAME="34_slow"
@@ -222,7 +222,7 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="--skip-slow"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
@@ -232,7 +232,7 @@ matrix:
           - PYTHON_VERSION=3.4
           - JOB_NAME: "34_nslow"
           - LOCALE_OVERRIDE="zh_CN.UTF-8"
-          - NOSE_ARGS="--skip-slow"
+          - TEST_ARGS="--skip-slow"
           - FULL_DEPS=true
           - CLIPBOARD=xsel
           - CACHE_NAME="34_nslow"
@@ -247,7 +247,7 @@ matrix:
           - PYTHON_VERSION=3.5
           - JOB_NAME: "35_numpy_dev"
           - JOB_TAG=_NUMPY_DEV
-          - NOSE_ARGS="--skip-slow --skip-network"
+          - TEST_ARGS="--skip-slow --skip-network"
           - PANDAS_TESTING_MODE="deprecate"
           - CACHE_NAME="35_numpy_dev"
           - USE_CACHE=true
@@ -260,7 +260,7 @@ matrix:
         env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="it_IT.UTF-8"
         - INSTALL_TEST=true
         - JOB_TAG=_COMPAT
@@ -275,7 +275,7 @@ matrix:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_ascii"
         - JOB_TAG=_ASCII
-        - NOSE_ARGS="--skip-slow --skip-network"
+        - TEST_ARGS="--skip-slow --skip-network"
         - LOCALE_OVERRIDE="C"
         - CACHE_NAME="35_ascii"
         - USE_CACHE=true

diff --git a/ci/install_test.sh b/ci/install_test.sh
@@ -8,7 +8,7 @@ if [ "$INSTALL_TEST" ]; then
     conda uninstall cython || exit 1
     python "$TRAVIS_BUILD_DIR"/setup.py sdist --formats=zip,gztar || exit 1
     pip install "$TRAVIS_BUILD_DIR"/dist/*tar.gz || exit 1
-    # nosetests --exe -A "$NOSE_ARGS" pandas/tests/test_series.py --with-xunit --xunit-file=/tmp/nosetests_install.xml
+    # nosetests --exe -A "$TEST_ARGS" pandas/tests/test_series.py --with-xunit --xunit-file=/tmp/nosetests_install.xml
     pytest pandas/tests/test_series.py --junitxml=/tmp/pytest_install.xml
 else
     echo "Skipping installation test."

diff --git a/ci/script.sh b/ci/script.sh
@@ -20,11 +20,11 @@ fi
 if [ "$BUILD_TEST" ]; then
     echo "We are not running nosetests as this is simply a build test."
 elif [ "$COVERAGE" ]; then
-    echo pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $NOSE_ARGS pandas
-    pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $NOSE_ARGS pandas
+    echo pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $TEST_ARGS pandas
+    pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $TEST_ARGS pandas
 else
-    echo pytest $NOSE_ARGS pandas
-    pytest $NOSE_ARGS pandas # TODO: doctest
+    echo pytest $TEST_ARGS pandas
+    pytest $TEST_ARGS pandas # TODO: doctest
 fi
 
 RET="$?"

diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
@@ -599,13 +599,21 @@ install *pandas*) by typing::
 
 The tests suite is exhaustive and takes around 20 minutes to run.  Often it is
 worth running only a subset of tests first around your changes before running the
-entire suite.  This is done using one of the following constructs::
+entire suite.
+
+The easiest way to do this is with::
+
+    pytest pandas/path/to/test.py -k regex_matching_test_name
+
+Or with one of the following constructs::
 
     pytest pandas/tests/[test-module].py
     pytest pandas/tests/[test-module].py::[TestClass]
     pytest pandas/tests/[test-module].py::[TestClass]::[test_method]
 
-  .. versionadded:: 0.18.0
+For more, see the `pytest<http://doc.pytest.org/en/latest/>`_ documentation.
+
+    .. versionadded:: 0.18.0
 
 Furthermore one can run