Skip to content

Commit 5999ac8

Browse files
committed
BLD: use numpy 1.8.1 in 2.7 build
use scipy 0.13.3 in 3.3. build BLD: move sql libs up in requirements to facilitate building wheels
1 parent c59bf0b commit 5999ac8

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

.travis.yml

-12
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,13 @@ matrix:
5151
- JOB_NAME: "27_numpy_master"
5252
- JOB_TAG=_NUMPY_DEV_master
5353
- NUMPY_BUILD=master
54-
- python: 2.7
55-
env:
56-
- NOSE_ARGS="not slow and not network and not disabled"
57-
- JOB_NAME: "27_numpy_1.8.x"
58-
- JOB_TAG=_NUMPY_DEV_1_8_x
59-
- NUMPY_BUILD=maintenance/1.8.x
6054
allow_failures:
6155
- python: 2.7
6256
env:
6357
- NOSE_ARGS="not slow and not network and not disabled"
6458
- JOB_NAME: "27_numpy_master"
6559
- JOB_TAG=_NUMPY_DEV_master
6660
- NUMPY_BUILD=master
67-
- python: 2.7
68-
env:
69-
- NOSE_ARGS="not slow and not network and not disabled"
70-
- JOB_NAME: "27_numpy_1.8.x"
71-
- JOB_TAG=_NUMPY_DEV_1_8_x
72-
- NUMPY_BUILD=maintenance/1.8.x
7361

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

ci/requirements-2.7.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
python-dateutil==2.1
22
pytz==2013b
33
xlwt==0.7.5
4-
numpy==1.8.0
4+
numpy==1.8.1
55
cython==0.19.1
66
bottleneck==0.6.0
77
numexpr==2.2.2
@@ -11,12 +11,12 @@ openpyxl==1.6.2
1111
xlsxwriter==0.4.6
1212
xlrd==0.9.2
1313
patsy==0.1.0
14+
sqlalchemy==0.8.1
15+
pymysql==0.6.1
16+
psycopg2==2.5.2
1417
html5lib==1.0b2
1518
lxml==3.2.1
1619
scipy==0.10.0
1720
beautifulsoup4==4.2.1
1821
statsmodels==0.5.0
1922
bigquery==2.0.17
20-
sqlalchemy==0.8.1
21-
pymysql==0.6.1
22-
psycopg2==2.5.2

ci/requirements-2.7_LOCALE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ cython==0.19.1
99
bottleneck==0.6.0
1010
matplotlib==1.3.0
1111
patsy==0.1.0
12+
sqlalchemy==0.8.1
1213
html5lib==1.0b2
1314
lxml==3.2.1
1415
scipy==0.10.0
1516
beautifulsoup4==4.2.1
1617
statsmodels==0.4.3
1718
bigquery==2.0.17
18-
sqlalchemy==0.8.1

ci/requirements-3.3.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ tables==3.1.0
1111
bottleneck==0.8.0
1212
matplotlib==1.2.1
1313
patsy==0.1.0
14-
lxml==3.2.1
15-
scipy==0.12.0
16-
beautifulsoup4==4.2.1
17-
statsmodels==0.5.0
1814
sqlalchemy==0.9.1
1915
pymysql==0.6.1
2016
psycopg2==2.5.2
17+
lxml==3.2.1
18+
scipy==0.13.3
19+
beautifulsoup4==4.2.1
20+
statsmodels==0.5.0

0 commit comments

Comments
 (0)