Skip to content
Permalink
Browse files

Attempt to merge setup dependencies (#408)

Merge setup dependencies

* Use pip to install all requirements except pytorch
* Remove strict pin of tqdm and tabulate
* Add pip caching to travis.yml
  • Loading branch information...
ottonemo authored and benjamin-work committed Dec 13, 2018
1 parent 3712369 commit 618e9be6dc0a92986b6ca5058c347be314e4cde3
Showing with 10 additions and 15 deletions.
  1. +4 −3 .travis.yml
  2. +4 −4 requirements.txt
  3. +2 −8 setup.py
@@ -9,6 +9,7 @@ env:

cache:
apt: true
pip: true
timeout: 1000
directories:
- $HOME/cache
@@ -28,10 +29,10 @@ install:

- conda create -y -n skorch-env python=${TRAVIS_PYTHON_VERSION}
- source activate skorch-env
- cat requirements.txt requirements-dev.txt > reqs.txt
- conda install --file=reqs.txt
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
- pip install fire
- pip install .
- python setup.py install
- conda install -c pytorch pytorch-cpu==${PYTORCH_VERSION}
script:
- pytest
@@ -1,5 +1,5 @@
numpy>=1.13.3
PyYAML==3.12
scikit-learn==0.19.1
scipy==0.19.0
tqdm==4.14.0
scikit-learn>=0.19.1
scipy>=1.1.0
tabulate>=0.7.7
tqdm>=4.14.0
@@ -6,14 +6,8 @@
with open('VERSION', 'r') as f:
version = f.read().rstrip()

# TODO: read from requirements.txt
install_requires = [
'numpy',
'scikit-learn>=0.18',
'scipy',
'tabulate',
'tqdm',
]
with open('requirements.txt') as f:
install_requires = [l.strip() for l in f]

tests_require = [
'pytest',

0 comments on commit 618e9be

Please sign in to comment.
You can’t perform that action at this time.