Skip to content

Commit 870b6a6

Browse files
authored
DEPS: set min versions (#17002)
closes #15206, numpy >= 1.9 closes #15543, matplotlib >= 1.4.3 scipy >= 0.14.0
1 parent 2f00159 commit 870b6a6

36 files changed

+221
-320
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ matrix:
3737
- JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
3838
- dist: trusty
3939
env:
40-
- JOB="2.7_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8"
40+
- JOB="2.7_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
4141
addons:
4242
apt:
4343
packages:
@@ -62,7 +62,7 @@ matrix:
6262
# In allow_failures
6363
- dist: trusty
6464
env:
65-
- JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
65+
- JOB="2.7_SLOW" SLOW=true
6666
# In allow_failures
6767
- dist: trusty
6868
env:
@@ -82,7 +82,7 @@ matrix:
8282
allow_failures:
8383
- dist: trusty
8484
env:
85-
- JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
85+
- JOB="2.7_SLOW" SLOW=true
8686
- dist: trusty
8787
env:
8888
- JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true

ci/install_travis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ which conda
4747
echo
4848
echo "[update conda]"
4949
conda config --set ssl_verify false || exit 1
50-
conda config --set always_yes true --set changeps1 false || exit 1
50+
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
5151
conda update -q conda
5252

5353
echo

ci/requirements-2.7_COMPAT.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
2-
numpy=1.7.1
2+
numpy=1.9.2
33
cython=0.23
44
dateutil=1.5
55
pytz=2013b

ci/requirements-2.7_COMPAT.run

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
numpy=1.7.1
1+
numpy=1.9.2
22
dateutil=1.5
33
pytz=2013b
4-
scipy=0.11.0
4+
scipy=0.14.0
55
xlwt=0.7.5
66
xlrd=0.9.2
7-
numexpr=2.2.2
8-
pytables=3.0.0
7+
bottleneck=1.0.0
8+
numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr
9+
pytables=3.2.2
910
psycopg2
1011
pymysql=0.6.0
1112
sqlalchemy=0.7.8

ci/requirements-2.7_LOCALE.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
22
python-dateutil
33
pytz=2013b
4-
numpy=1.8.2
4+
numpy=1.9.2
55
cython=0.23

ci/requirements-2.7_LOCALE.run

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
python-dateutil
22
pytz=2013b
3-
numpy=1.8.2
3+
numpy=1.9.2
44
xlwt=0.7.5
55
openpyxl=1.6.2
66
xlsxwriter=0.5.2
77
xlrd=0.9.2
8-
matplotlib=1.3.1
8+
bottleneck=1.0.0
9+
matplotlib=1.4.3
910
sqlalchemy=0.8.1
1011
lxml=3.2.1
1112
scipy

ci/requirements-2.7_SLOW.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
22
python-dateutil
33
pytz
4-
numpy=1.8.2
4+
numpy=1.10*
55
cython

ci/requirements-2.7_SLOW.run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
python-dateutil
22
pytz
3-
numpy=1.8.2
4-
matplotlib=1.3.1
3+
numpy=1.10*
4+
matplotlib=1.4.3
55
scipy
66
patsy
77
xlwt

ci/script_multi.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ elif [ "$COVERAGE" ]; then
3636
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
3737
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
3838

39+
elif [ "$SLOW" ]; then
40+
TEST_ARGS="--only-slow --skip-network"
41+
echo pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
42+
pytest -r xX -m "not single and slow" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
43+
3944
else
4045
echo pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
4146
pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
47+
4248
fi
4349

4450
RET="$?"

ci/script_single.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,24 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
1212
python -c "$pycmd"
1313
fi
1414

15+
if [ "$SLOW" ]; then
16+
TEST_ARGS="--only-slow --skip-network"
17+
fi
18+
1519
if [ "$BUILD_TEST" ]; then
1620
echo "We are not running pytest as this is a build test."
21+
1722
elif [ "$DOC" ]; then
1823
echo "We are not running pytest as this is a doc-build"
24+
1925
elif [ "$COVERAGE" ]; then
2026
echo pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
2127
pytest -s -m "single" --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
28+
2229
else
2330
echo pytest -m "single" -r xX --junitxml=/tmp/single.xml $TEST_ARGS pandas
2431
pytest -m "single" -r xX --junitxml=/tmp/single.xml $TEST_ARGS pandas # TODO: doctest
32+
2533
fi
2634

2735
RET="$?"

0 commit comments

Comments
 (0)