Skip to content

Commit 1cc5b67

Browse files
committed
TST: have the build test exercise pandas.test()
1 parent 59b88ab commit 1cc5b67

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

.travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ matrix:
3333
- PYTHON_VERSION=3.5
3434
- JOB_NAME: "35_osx"
3535
- TEST_ARGS="--skip-slow --skip-network"
36-
- BUILD_TYPE=conda
3736
- JOB_TAG=_OSX
3837
- TRAVIS_PYTHON_VERSION=3.5
3938
- CACHE_NAME="35_osx"
@@ -107,12 +106,12 @@ matrix:
107106
- python: 2.7
108107
env:
109108
- PYTHON_VERSION=2.7
110-
- JOB_NAME: "27_build_test_conda"
109+
- JOB_NAME: "27_build_test"
111110
- JOB_TAG=_BUILD_TEST
112111
- TEST_ARGS="--skip-slow"
113112
- FULL_DEPS=true
114113
- BUILD_TEST=true
115-
- CACHE_NAME="27_build_test_conda"
114+
- CACHE_NAME="27_build_test"
116115
- USE_CACHE=true
117116
# In allow_failures
118117
- python: 3.5
@@ -147,12 +146,12 @@ matrix:
147146
- python: 2.7
148147
env:
149148
- PYTHON_VERSION=2.7
150-
- JOB_NAME: "27_build_test_conda"
149+
- JOB_NAME: "27_build_test"
151150
- JOB_TAG=_BUILD_TEST
152151
- TEST_ARGS="--skip-slow"
153152
- FULL_DEPS=true
154153
- BUILD_TEST=true
155-
- CACHE_NAME="27_build_test_conda"
154+
- CACHE_NAME="27_build_test"
156155
- USE_CACHE=true
157156
- python: 3.5
158157
env:

ci/install_travis.sh

+24-21
Original file line numberDiff line numberDiff line change
@@ -132,36 +132,39 @@ fi
132132
if [ "$BUILD_TEST" ]; then
133133

134134
# build testing
135-
pip uninstall --yes cython
136-
pip install cython==0.23
137-
( python setup.py build_ext --inplace && python setup.py develop ) || true
135+
python setup.py install || exit 1
138136

139137
else
140138

141139
# build but don't install
142140
echo "[build em]"
143141
time python setup.py build_ext --inplace || exit 1
144142

145-
# we may have run installations
146-
echo "[conda installs]"
147-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run"
148-
if [ -e ${REQ} ]; then
149-
time conda install -n pandas --file=${REQ} || exit 1
150-
fi
143+
fi
151144

152-
# we may have additional pip installs
153-
echo "[pip installs]"
154-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip"
155-
if [ -e ${REQ} ]; then
156-
pip install -r $REQ
157-
fi
145+
# we may have run installations
146+
echo "[conda installs]"
147+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.run"
148+
if [ -e ${REQ} ]; then
149+
time conda install -n pandas --file=${REQ} || exit 1
150+
fi
158151

159-
# may have addtl installation instructions for this build
160-
echo "[addtl installs]"
161-
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
162-
if [ -e ${REQ} ]; then
163-
time bash $REQ || exit 1
164-
fi
152+
# we may have additional pip installs
153+
echo "[pip installs]"
154+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.pip"
155+
if [ -e ${REQ} ]; then
156+
pip install -r $REQ
157+
fi
158+
159+
# may have addtl installation instructions for this build
160+
echo "[addtl installs]"
161+
REQ="ci/requirements-${PYTHON_VERSION}${JOB_TAG}.sh"
162+
if [ -e ${REQ} ]; then
163+
time bash $REQ || exit 1
164+
fi
165+
166+
# finish install if we are not doing a build-testk
167+
if [ -z "$BUILD_TEST" ]; then
165168

166169
# remove any installed pandas package
167170
# w/o removing anything else

ci/script_multi.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 429496
2424
echo PYTHONHASHSEED=$PYTHONHASHSEED
2525

2626
if [ "$BUILD_TEST" ]; then
27-
echo "We are not running pytest as this is simply a build test."
27+
cd /tmp
28+
python -c "import pandas; pandas.test(['-n 2'])"
2829
elif [ "$COVERAGE" ]; then
2930
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
3031
pytest -s -n 2 -m "not single" --cov=pandas --cov-append --cov-report xml:/tmp/cov.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas

0 commit comments

Comments
 (0)