Skip to content

Commit 1dd7750

Browse files
committed
BLD: move PANDAS_TESTING_MODE env variable to .travis_yml
BLD: remove scatterci references
1 parent f75e781 commit 1dd7750

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: python
33
env:
44
global:
55
# scatterci API key
6-
- secure: "Bx5umgo6WjuGY+5XFa004xjCiX/vq0CyMZ/ETzcs7EIBI1BE/0fIDXOoWhoxbY9HPfdPGlDnDgB9nGqr5wArO2s+BavyKBWg6osZ3dmkfuJPMOWeyCa92EeP+sfKw8e5HSU5MizW9e319wHWOF/xkzdHR7T67Qd5erhv91x4DnQ="
6+
#- secure: "Bx5umgo6WjuGY+5XFa004xjCiX/vq0CyMZ/ETzcs7EIBI1BE/0fIDXOoWhoxbY9HPfdPGlDnDgB9nGqr5wArO2s+BavyKBWg6osZ3dmkfuJPMOWeyCa92EeP+sfKw8e5HSU5MizW9e319wHWOF/xkzdHR7T67Qd5erhv91x4DnQ="
77
# ironcache API key
88
- secure: "e4eEFn9nDQc3Xa5BWYkzfX37jaWVq89XidVX+rcCNEr5OlOImvveeXnF1IzbRXznH4Sv0YsLwUd8RGUWOmyCvkONq/VJeqCHWtTMyfaCIdqSyhIP9Odz8r9ahch+Y0XFepBey92AJHmlnTh+2GjCDgIiqq4fzglojnp56Vg1ojA="
99
- secure: "CjmYmY5qEu3KrvMtel6zWFEtMq8ORBeS1S1odJHnjQpbwT1KY2YFZRVlLphfyDQXSz6svKUdeRrCNp65baBzs3DQNA8lIuXGIBYFeJxqVGtYAZZs6+TzBPfJJK798sGOj5RshrOJkFG2rdlWNuTq/XphI0JOrN3nPUkRrdQRpAw="
@@ -51,13 +51,15 @@ matrix:
5151
- JOB_NAME: "27_numpy_master"
5252
- JOB_TAG=_NUMPY_DEV_master
5353
- NUMPY_BUILD=master
54+
- PANDAS_TESTING_MODE="numpy_deprecate"
5455
allow_failures:
5556
- python: 2.7
5657
env:
5758
- NOSE_ARGS="not slow and not network and not disabled"
5859
- JOB_NAME: "27_numpy_master"
5960
- JOB_TAG=_NUMPY_DEV_master
6061
- NUMPY_BUILD=master
62+
- PANDAS_TESTING_MODE="numpy_deprecate"
6163

6264
# allow importing from site-packages,
6365
# so apt-get python-x works for system pythons

ci/after_script.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
wget https://raw.github.com/y-p/ScatterCI-CLI/master/scatter_cli.py
4-
chmod u+x scatter_cli.py
3+
#wget https://raw.github.com/y-p/ScatterCI-CLI/master/scatter_cli.py
4+
#chmod u+x scatter_cli.py
55

66
pip install -I requests==2.1.0
77
echo "${TRAVIS_PYTHON_VERSION:0:4}"
@@ -12,7 +12,6 @@ fi
1212
# ScatterCI accepts a build log, but currently does nothing with it.
1313
echo '' > /tmp/build.log
1414

15-
# These should be in the environment, but not in source control
1615
# nore exposed in the build logs
1716
#export SCATTERCI_ACCESS_KEY=
1817
#export SCATTERCI_HOST=
@@ -22,6 +21,6 @@ ci/print_versions.py -j /tmp/env.json
2221

2322
# nose ran using "--with-xunit --xunit-file nosetest.xml" and generated /tmp/nosetest.xml
2423
# Will timeout if server not available, and should not fail the build
25-
python scatter_cli.py --xunit-file /tmp/nosetests.xml --log-file /tmp/build.log --env-file /tmp/env.json --build-name "$JOB_NAME" --succeed
24+
#python scatter_cli.py --xunit-file /tmp/nosetests.xml --log-file /tmp/build.log --env-file /tmp/env.json --build-name "$JOB_NAME" --succeed
2625

2726
true # never fail because bad things happened here

ci/script.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ fi
1616
"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1 > /tmp/doc.log &
1717
# doc build log will be shown after tests
1818

19-
# export the testing mode
20-
if [ -n "$NUMPY_BUILD" ]; then
21-
22-
export PANDAS_TESTING_MODE="numpy_deprecate"
23-
24-
fi
25-
2619
echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml
2720
nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml
2821

0 commit comments

Comments
 (0)