Skip to content

Commit

Permalink
BLD: use numpy 1.8.1 in 2.7 build
Browse files Browse the repository at this point in the history
     use scipy 0.13.3 in 3.3. build
BLD: move sql libs up in requirements to facilitate building wheels
  • Loading branch information
jreback committed Mar 26, 2014
1 parent c59bf0b commit 5999ac8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
12 changes: 0 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,13 @@ matrix:
- JOB_NAME: "27_numpy_master"
- JOB_TAG=_NUMPY_DEV_master
- NUMPY_BUILD=master
- python: 2.7
env:
- NOSE_ARGS="not slow and not network and not disabled"
- JOB_NAME: "27_numpy_1.8.x"
- JOB_TAG=_NUMPY_DEV_1_8_x
- NUMPY_BUILD=maintenance/1.8.x
allow_failures:
- python: 2.7
env:
- NOSE_ARGS="not slow and not network and not disabled"
- JOB_NAME: "27_numpy_master"
- JOB_TAG=_NUMPY_DEV_master
- NUMPY_BUILD=master
- python: 2.7
env:
- NOSE_ARGS="not slow and not network and not disabled"
- JOB_NAME: "27_numpy_1.8.x"
- JOB_TAG=_NUMPY_DEV_1_8_x
- NUMPY_BUILD=maintenance/1.8.x

# allow importing from site-packages,
# so apt-get python-x works for system pythons
Expand Down
8 changes: 4 additions & 4 deletions ci/requirements-2.7.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
python-dateutil==2.1
pytz==2013b
xlwt==0.7.5
numpy==1.8.0
numpy==1.8.1
cython==0.19.1
bottleneck==0.6.0
numexpr==2.2.2
Expand All @@ -11,12 +11,12 @@ openpyxl==1.6.2
xlsxwriter==0.4.6
xlrd==0.9.2
patsy==0.1.0
sqlalchemy==0.8.1
pymysql==0.6.1
psycopg2==2.5.2
html5lib==1.0b2
lxml==3.2.1
scipy==0.10.0
beautifulsoup4==4.2.1
statsmodels==0.5.0
bigquery==2.0.17
sqlalchemy==0.8.1
pymysql==0.6.1
psycopg2==2.5.2
2 changes: 1 addition & 1 deletion ci/requirements-2.7_LOCALE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ cython==0.19.1
bottleneck==0.6.0
matplotlib==1.3.0
patsy==0.1.0
sqlalchemy==0.8.1
html5lib==1.0b2
lxml==3.2.1
scipy==0.10.0
beautifulsoup4==4.2.1
statsmodels==0.4.3
bigquery==2.0.17
sqlalchemy==0.8.1
8 changes: 4 additions & 4 deletions ci/requirements-3.3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ tables==3.1.0
bottleneck==0.8.0
matplotlib==1.2.1
patsy==0.1.0
lxml==3.2.1
scipy==0.12.0
beautifulsoup4==4.2.1
statsmodels==0.5.0
sqlalchemy==0.9.1
pymysql==0.6.1
psycopg2==2.5.2
lxml==3.2.1
scipy==0.13.3
beautifulsoup4==4.2.1
statsmodels==0.5.0

0 comments on commit 5999ac8

Please sign in to comment.