Skip to content

Commit

Permalink
add scipy to travis pipeline (blue-yonder#493)
Browse files Browse the repository at this point in the history
* add scipy to travis pipeline

* mvoe scipy up to 0.18.0

* update changelog

* update scipy to 1.0.0

* upgrade scipy to 1.2.0

* update changelog
  • Loading branch information
MaxBenChrist authored Feb 19, 2019
1 parent e3801b3 commit 7d52283
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ install:
jobs:
include:
- stage: Run unit tests and deploy
env: NUMPY="latest", PANDAS="0.23.4", SCIKITLEARN="latest", DASK="latest", DISTRIBUTED="latest"
env: NUMPY="latest", PANDAS="0.23.4", SCIKITLEARN="latest", DASK="latest", DISTRIBUTED="latest", SCIPY="latest"
before_script:
- pip install --upgrade numpy
- pip install pandas===0.23.4
- pip install --upgrade scikit-learn
- pip install --upgrade dask
- pip install --upgrade distributed
- pip install --upgrade scipy
- pip list
script:
- sed -i 's/\-n auto/\-n 2/g' setup.cfg
Expand All @@ -30,21 +31,22 @@ jobs:
- coveralls

- stage: Run unit tests and deploy
env: NUMPY="latest", PANDAS="0.23.4", SCIKITLEARN="latest", DASK="latest", DISTRIBUTED="latest"
env: NUMPY="latest", PANDAS="0.23.4", SCIKITLEARN="latest", DASK="latest", DISTRIBUTED="latest", SCIPY="latest"
before_script:
- pip install --upgrade numpy
- pip install pandas===0.23.4
- pip install --upgrade scikit-learn
- pip install --upgrade dask
- pip install --upgrade distributed
- pip install --upgrade scipy
- pip list
script:
- sed -i 's/\-n auto/\-n 2/g' setup.cfg
- "if [ $TRAVIS_PULL_REQUEST == false ] && ! [ $TRAVIS_BRANCH == 'master' ]; then pytest tests/units -n2; else pytest tests; fi"
python: 3.5.2

- stage: Run unit tests and deploy
env: NUMPY="1.10.4", PANDAS="0.20.3", SCIKITLEARN="0.18.0", DASK="0.15.2", DISTRIBUTED="1.18.3"
env: NUMPY="1.10.4", PANDAS="0.20.3", SCIKITLEARN="0.18.0", DASK="0.15.2", DISTRIBUTED="1.18.3", SCIPY="1.2.0"
before_script:
- pip install numpy==1.10.4
- pip install pandas==0.20.3
Expand All @@ -53,14 +55,15 @@ jobs:
- pip install distributed==1.18.3
# need to downgrade tornado manually
- pip install tornado==4.5.3
- pip install scipy==1.2.0
- pip list
script:
- sed -i 's/\-n auto/\-n 2/g' setup.cfg
- "if [ $TRAVIS_PULL_REQUEST == false ] && ! [ $TRAVIS_BRANCH == 'master' ]; then pytest tests/units -n2; else pytest tests; fi"
python: 2.7.11

- stage: Run unit tests and deploy
env: NUMPY="1.10.4", PANDAS="0.20.3", SCIKITLEARN="0.18.0", DASK="0.15.2", DISTRIBUTED="1.18.3"
env: NUMPY="1.10.4", PANDAS="0.20.3", SCIKITLEARN="0.18.0", DASK="0.15.2", DISTRIBUTED="1.18.3", SCIPY="1.2.0"
before_script:
- pip install numpy==1.10.4
- pip install pandas==0.20.3
Expand All @@ -69,6 +72,7 @@ jobs:
- pip install distributed==1.18.3
# need to downgrade tornado manually
- pip install tornado==4.5.3
- pip install scipy==1.2.0
- pip list
script:
- sed -i 's/\-n auto/\-n 2/g' setup.cfg
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tsfresh uses `Semantic Versioning <http://semver.org/>`_

Unreleased
==========

- increased scipy dependency to 1.2.0


Version 0.11.2
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
requests>=2.9.1
numpy>=1.10.4
pandas>=0.20.3,<=0.23.4 # pandas dropna is buggy in 0.24.0, see https://github.com/blue-yonder/tsfresh/issues/485 and https://github.com/pandas-dev/pandas/issues/25087
scipy>=0.17.0
scipy>=1.2.0
statsmodels>=0.8.0
patsy>=0.4.1
scikit-learn>=0.19.0
Expand Down

0 comments on commit 7d52283

Please sign in to comment.