Skip to content

Commit a76e5b4

Browse files
authored
CI: remove PIP & old conda build in favor of pandas-ci buildsx (#19775)
1 parent 718d067 commit a76e5b4

7 files changed

+6
-81
lines changed

.travis.yml

+2-15
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ matrix:
5050
packages:
5151
- python-gtk2
5252
# In allow_failures
53-
- dist: trusty
54-
env:
55-
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
5653
- dist: trusty
5754
env:
5855
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
@@ -63,36 +60,26 @@ matrix:
6360
# In allow_failures
6461
- dist: trusty
6562
env:
66-
- JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
63+
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
6764
addons:
6865
apt:
6966
packages:
7067
- xsel
7168
# In allow_failures
72-
- dist: trusty
73-
env:
74-
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
75-
# In allow_failures
7669
- dist: trusty
7770
env:
7871
- JOB="3.6_DOC" DOC=true
7972
allow_failures:
80-
- dist: trusty
81-
env:
82-
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
8373
- dist: trusty
8474
env:
8575
- JOB="2.7_SLOW" SLOW=true
8676
- dist: trusty
8777
env:
88-
- JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
78+
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
8979
addons:
9080
apt:
9181
packages:
9282
- xsel
93-
- dist: trusty
94-
env:
95-
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
9683
- dist: trusty
9784
env:
9885
- JOB="3.6_DOC" DOC=true

ci/install_travis.sh

+2-26
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,6 @@ if [ "$COVERAGE" ]; then
115115
pip install coverage pytest-cov
116116
fi
117117

118-
echo
119-
if [ -z "$PIP_BUILD_TEST" ] ; then
120-
121-
# build but don't install
122-
echo "[build em]"
123-
time python setup.py build_ext --inplace || exit 1
124-
125-
fi
126-
127118
# we may have run installations
128119
echo
129120
echo "[conda installs]"
@@ -161,23 +152,8 @@ conda list pandas
161152
pip list --format columns |grep pandas
162153

163154
# build and install
164-
echo
165-
166-
if [ "$PIP_BUILD_TEST" ]; then
167-
168-
# build & install testing
169-
echo "[building release]"
170-
time bash scripts/build_dist_for_release.sh || exit 1
171-
conda uninstall -y cython
172-
time pip install dist/*tar.gz || exit 1
173-
174-
else
175-
176-
# install our pandas
177-
echo "[running setup.py develop]"
178-
python setup.py develop || exit 1
179-
180-
fi
155+
echo "[running setup.py develop]"
156+
python setup.py develop || exit 1
181157

182158
echo
183159
echo "[show pandas]"

ci/requirements-3.6_PIP_BUILD_TEST.build

-6
This file was deleted.

ci/requirements-3.6_PIP_BUILD_TEST.pip

-6
This file was deleted.

ci/requirements-3.6_PIP_BUILD_TEST.sh

-7
This file was deleted.

ci/script_multi.sh

+1-17
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,7 @@ fi
2323
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
2424
echo PYTHONHASHSEED=$PYTHONHASHSEED
2525

26-
if [ "$PIP_BUILD_TEST" ] ; then
27-
echo "[build-test]"
28-
29-
echo "[env]"
30-
pip list --format columns |grep pandas
31-
32-
echo "[running]"
33-
cd /tmp
34-
unset PYTHONPATH
35-
36-
echo "[build-test: single]"
37-
python -c 'import pandas; pandas.test(["--skip-slow", "--skip-network", "-r xX", "-m single"])'
38-
39-
echo "[build-test: not single]"
40-
python -c 'import pandas; pandas.test(["-n 2", "--skip-slow", "--skip-network", "-r xX", "-m not single"])'
41-
42-
elif [ "$DOC" ]; then
26+
if [ "$DOC" ]; then
4327
echo "We are not running pytest as this is a doc-build"
4428

4529
elif [ "$COVERAGE" ]; then

ci/script_single.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ if echo "$TEST_ARGS" | grep -e --skip-network -q; then
2121
export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
2222
fi
2323

24-
if [ "$PIP_BUILD_TEST" ]; then
25-
echo "We are not running pytest as this is a build test."
26-
27-
elif [ "$DOC" ]; then
24+
if [ "$DOC" ]; then
2825
echo "We are not running pytest as this is a doc-build"
2926

3027
elif [ "$COVERAGE" ]; then

0 commit comments

Comments
 (0)