Skip to content

Commit 59e2be9

Browse files
TomAugspurgerTomAugspurger
committed
NOSE_ARGS -> TEST_ARGS
1 parent 03695aa commit 59e2be9

File tree

4 files changed

+34
-26
lines changed

4 files changed

+34
-26
lines changed

‎.travis.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ matrix:
3232
env:
3333
- PYTHON_VERSION=3.5
3434
- JOB_NAME: "35_osx"
35-
- NOSE_ARGS="--skip-slow --skip-network"
35+
- TEST_ARGS="--skip-slow --skip-network"
3636
- BUILD_TYPE=conda
3737
- JOB_TAG=_OSX
3838
- TRAVIS_PYTHON_VERSION=3.5
@@ -42,7 +42,7 @@ matrix:
4242
env:
4343
- PYTHON_VERSION=2.7
4444
- JOB_NAME: "27_slow_nnet_LOCALE"
45-
- NOSE_ARGS="--only-slow --skip-network"
45+
- TEST_ARGS="--only-slow --skip-network"
4646
- LOCALE_OVERRIDE="zh_CN.UTF-8"
4747
- FULL_DEPS=true
4848
- JOB_TAG=_LOCALE
@@ -56,7 +56,7 @@ matrix:
5656
env:
5757
- PYTHON_VERSION=2.7
5858
- JOB_NAME: "27_nslow"
59-
- NOSE_ARGS="--skip-slow"
59+
- TEST_ARGS="--skip-slow"
6060
- FULL_DEPS=true
6161
- CLIPBOARD_GUI=gtk2
6262
- LINT=true
@@ -70,7 +70,7 @@ matrix:
7070
env:
7171
- PYTHON_VERSION=3.5
7272
- JOB_NAME: "35_nslow"
73-
- NOSE_ARGS="--skip-slow --skip-network"
73+
- TEST_ARGS="--skip-slow --skip-network"
7474
- FULL_DEPS=true
7575
- CLIPBOARD=xsel
7676
- COVERAGE=true
@@ -84,7 +84,7 @@ matrix:
8484
env:
8585
- PYTHON_VERSION=3.6
8686
- JOB_NAME: "36"
87-
- NOSE_ARGS="--skip-slow --skip-network"
87+
- TEST_ARGS="--skip-slow --skip-network"
8888
- PANDAS_TESTING_MODE="deprecate"
8989
addons:
9090
apt:
@@ -96,7 +96,7 @@ matrix:
9696
env:
9797
- PYTHON_VERSION=2.7
9898
- JOB_NAME: "27_nslow_nnet_COMPAT"
99-
- NOSE_ARGS="--skip-slow --skip-network"
99+
- TEST_ARGS="--skip-slow --skip-network"
100100
- LOCALE_OVERRIDE="it_IT.UTF-8"
101101
- INSTALL_TEST=true
102102
- JOB_TAG=_COMPAT
@@ -112,7 +112,7 @@ matrix:
112112
- PYTHON_VERSION=2.7
113113
- JOB_NAME: "27_slow"
114114
- JOB_TAG=_SLOW
115-
- NOSE_ARGS="--only-slow --skip-network"
115+
- TEST_ARGS="--only-slow --skip-network"
116116
- FULL_DEPS=true
117117
- CACHE_NAME="27_slow"
118118
- USE_CACHE=true
@@ -122,7 +122,7 @@ matrix:
122122
- PYTHON_VERSION=2.7
123123
- JOB_NAME: "27_build_test_conda"
124124
- JOB_TAG=_BUILD_TEST
125-
- NOSE_ARGS="--skip-slow"
125+
- TEST_ARGS="--skip-slow"
126126
- FULL_DEPS=true
127127
- BUILD_TEST=true
128128
- CACHE_NAME="27_build_test_conda"
@@ -133,7 +133,7 @@ matrix:
133133
- PYTHON_VERSION=3.4
134134
- JOB_NAME: "34_nslow"
135135
- LOCALE_OVERRIDE="zh_CN.UTF-8"
136-
- NOSE_ARGS="--skip-slow"
136+
- TEST_ARGS="--skip-slow"
137137
- FULL_DEPS=true
138138
- CLIPBOARD=xsel
139139
- CACHE_NAME="34_nslow"
@@ -149,7 +149,7 @@ matrix:
149149
- PYTHON_VERSION=3.4
150150
- JOB_NAME: "34_slow"
151151
- JOB_TAG=_SLOW
152-
- NOSE_ARGS="--only-slow --skip-network"
152+
- TEST_ARGS="--only-slow --skip-network"
153153
- FULL_DEPS=true
154154
- CLIPBOARD=xsel
155155
- CACHE_NAME="34_slow"
@@ -164,7 +164,7 @@ matrix:
164164
- PYTHON_VERSION=3.5
165165
- JOB_NAME: "35_numpy_dev"
166166
- JOB_TAG=_NUMPY_DEV
167-
- NOSE_ARGS="--skip-slow --skip-network"
167+
- TEST_ARGS="--skip-slow --skip-network"
168168
- PANDAS_TESTING_MODE="deprecate"
169169
- CACHE_NAME="35_numpy_dev"
170170
- USE_CACHE=true
@@ -179,7 +179,7 @@ matrix:
179179
- PYTHON_VERSION=3.5
180180
- JOB_NAME: "35_ascii"
181181
- JOB_TAG=_ASCII
182-
- NOSE_ARGS="--skip-slow --skip-network"
182+
- TEST_ARGS="--skip-slow --skip-network"
183183
- LOCALE_OVERRIDE="C"
184184
- CACHE_NAME="35_ascii"
185185
- USE_CACHE=true
@@ -199,7 +199,7 @@ matrix:
199199
- PYTHON_VERSION=2.7
200200
- JOB_NAME: "27_slow"
201201
- JOB_TAG=_SLOW
202-
- NOSE_ARGS="--only-slow --skip-network"
202+
- TEST_ARGS="--only-slow --skip-network"
203203
- FULL_DEPS=true
204204
- CACHE_NAME="27_slow"
205205
- USE_CACHE=true
@@ -208,7 +208,7 @@ matrix:
208208
- PYTHON_VERSION=3.4
209209
- JOB_NAME: "34_slow"
210210
- JOB_TAG=_SLOW
211-
- NOSE_ARGS="--only-slow --skip-network"
211+
- TEST_ARGS="--only-slow --skip-network"
212212
- FULL_DEPS=true
213213
- CLIPBOARD=xsel
214214
- CACHE_NAME="34_slow"
@@ -222,7 +222,7 @@ matrix:
222222
- PYTHON_VERSION=2.7
223223
- JOB_NAME: "27_build_test_conda"
224224
- JOB_TAG=_BUILD_TEST
225-
- NOSE_ARGS="--skip-slow"
225+
- TEST_ARGS="--skip-slow"
226226
- FULL_DEPS=true
227227
- BUILD_TEST=true
228228
- CACHE_NAME="27_build_test_conda"
@@ -232,7 +232,7 @@ matrix:
232232
- PYTHON_VERSION=3.4
233233
- JOB_NAME: "34_nslow"
234234
- LOCALE_OVERRIDE="zh_CN.UTF-8"
235-
- NOSE_ARGS="--skip-slow"
235+
- TEST_ARGS="--skip-slow"
236236
- FULL_DEPS=true
237237
- CLIPBOARD=xsel
238238
- CACHE_NAME="34_nslow"
@@ -247,7 +247,7 @@ matrix:
247247
- PYTHON_VERSION=3.5
248248
- JOB_NAME: "35_numpy_dev"
249249
- JOB_TAG=_NUMPY_DEV
250-
- NOSE_ARGS="--skip-slow --skip-network"
250+
- TEST_ARGS="--skip-slow --skip-network"
251251
- PANDAS_TESTING_MODE="deprecate"
252252
- CACHE_NAME="35_numpy_dev"
253253
- USE_CACHE=true
@@ -260,7 +260,7 @@ matrix:
260260
env:
261261
- PYTHON_VERSION=2.7
262262
- JOB_NAME: "27_nslow_nnet_COMPAT"
263-
- NOSE_ARGS="--skip-slow --skip-network"
263+
- TEST_ARGS="--skip-slow --skip-network"
264264
- LOCALE_OVERRIDE="it_IT.UTF-8"
265265
- INSTALL_TEST=true
266266
- JOB_TAG=_COMPAT
@@ -275,7 +275,7 @@ matrix:
275275
- PYTHON_VERSION=3.5
276276
- JOB_NAME: "35_ascii"
277277
- JOB_TAG=_ASCII
278-
- NOSE_ARGS="--skip-slow --skip-network"
278+
- TEST_ARGS="--skip-slow --skip-network"
279279
- LOCALE_OVERRIDE="C"
280280
- CACHE_NAME="35_ascii"
281281
- USE_CACHE=true

‎ci/install_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [ "$INSTALL_TEST" ]; then
88
conda uninstall cython || exit 1
99
python "$TRAVIS_BUILD_DIR"/setup.py sdist --formats=zip,gztar || exit 1
1010
pip install "$TRAVIS_BUILD_DIR"/dist/*tar.gz || exit 1
11-
# nosetests --exe -A "$NOSE_ARGS" pandas/tests/test_series.py --with-xunit --xunit-file=/tmp/nosetests_install.xml
11+
# nosetests --exe -A "$TEST_ARGS" pandas/tests/test_series.py --with-xunit --xunit-file=/tmp/nosetests_install.xml
1212
pytest pandas/tests/test_series.py --junitxml=/tmp/pytest_install.xml
1313
else
1414
echo "Skipping installation test."

‎ci/script.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ fi
2020
if [ "$BUILD_TEST" ]; then
2121
echo "We are not running nosetests as this is simply a build test."
2222
elif [ "$COVERAGE" ]; then
23-
echo pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $NOSE_ARGS pandas
24-
pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $NOSE_ARGS pandas
23+
echo pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $TEST_ARGS pandas
24+
pytest -s --cov=pandas --cov-report xml:/tmp/nosetests.xml $TEST_ARGS pandas
2525
else
26-
echo pytest $NOSE_ARGS pandas
27-
pytest $NOSE_ARGS pandas # TODO: doctest
26+
echo pytest $TEST_ARGS pandas
27+
pytest $TEST_ARGS pandas # TODO: doctest
2828
fi
2929

3030
RET="$?"

‎doc/source/contributing.rst

+10-2
Original file line numberDiff line numberDiff line change
@@ -599,13 +599,21 @@ install *pandas*) by typing::
599599

600600
The tests suite is exhaustive and takes around 20 minutes to run. Often it is
601601
worth running only a subset of tests first around your changes before running the
602-
entire suite. This is done using one of the following constructs::
602+
entire suite.
603+
604+
The easiest way to do this is with::
605+
606+
pytest pandas/path/to/test.py -k regex_matching_test_name
607+
608+
Or with one of the following constructs::
603609

604610
pytest pandas/tests/[test-module].py
605611
pytest pandas/tests/[test-module].py::[TestClass]
606612
pytest pandas/tests/[test-module].py::[TestClass]::[test_method]
607613

608-
.. versionadded:: 0.18.0
614+
For more, see the `pytest<http://doc.pytest.org/en/latest/>`_ documentation.
615+
616+
.. versionadded:: 0.18.0
609617

610618
Furthermore one can run
611619

0 commit comments

Comments
 (0)