Skip to content

Commit

Permalink
unpin numpy/pandas for quick test
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Hamman committed Dec 28, 2016
1 parent ddd5211 commit aa81a17
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ install:
- source activate test_env
# scipy should not have been installed, but it's included in older versions of
# the conda pandas package
- if [[ "$CONDA_ENV" == "py27-min" ]]; then
conda remove scipy;
fi
# - if [[ "$CONDA_ENV" == "py27-min" ]]; then
# conda remove scipy;
# fi
- python setup.py install

script:
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-py27-min.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: test_env
dependencies:
- python=2.7
- pytest
- numpy==1.9.3
- pandas==0.15.0
- numpy
- pandas
- pip:
- coveralls
- pytest-cov

0 comments on commit aa81a17

Please sign in to comment.