Skip to content

Commit

Permalink
Install some deps via apt-get for travis speedup
Browse files Browse the repository at this point in the history
  • Loading branch information
sjpfenninger committed Jan 13, 2015
1 parent 8c5f313 commit 79e4aab
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ before_install:
- "sudo apt-get update -qq"
- "sudo apt-get install -y glpk-utils"
- "sudo apt-get install -y libhdf5-serial-dev" # Required to compile pytables
# Install some Python dependencies via apt-get to speed things up
- "sudo apt-get install -y cython"
- "sudo apt-get install -y python-numpy"
- "sudo apt-get install -y python-matplotlib"
- "sudo apt-get install -y python-tables"

install:
- "pip install -r requirements.txt"
- "pip install tables==3.1.0" # Fails if in requirements.txt
Expand Down
15 changes: 8 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
pytest-cov==1.8.0
python-coveralls==2.4.3
# Cython is here because it's needed to build pytables
Cython==0.21.1
# Cython==0.21.1
# The following four dependencies are install via apt-get on travis
# numpy==1.8.2
# matplotlib==1.4.1
# tables==3.1.0
numexpr==2.3.1
numpy==1.9.0
matplotlib==1.4.1
pandas==0.15.1
PyYAML==3.11
pyomo>=4.0rc9540
# tables==3.1.0
pyomo>=4.0
click==3.3
pytest-cov==1.8.0
python-coveralls==2.4.3
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
'test/common/t_6h/*.csv',
'test/common/t_erroneous/*.csv']},
install_requires=[
"pyomo >= 4.0rc9540",
"numpy >= 1.9.0",
"pyomo >= 4.0",
"numpy >= 1.8.2",
"numexpr >= 2.3.1",
"pandas >= 0.15.1",
"pyyaml >= 3.11",
Expand All @@ -39,6 +39,7 @@
]
},
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python',
Expand Down

0 comments on commit 79e4aab

Please sign in to comment.