Install pip with conda

This commit is contained in:
Raul Ochoa
2016-06-17 00:41:48 +02:00
parent 1edb55a790
commit 78fadc14d0
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ before_install:
- conda update --yes conda
install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION numpy=1.11.0 scipy=0.17.1 pysal=1.11.1 scikit-learn=0.17.1
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy=1.11.0 scipy=0.17.1 pysal=1.11.1 scikit-learn=0.17.1
- sudo make install
script: make test
+1 -1
View File
@@ -40,7 +40,7 @@ setup(
# The choice of component versions is dictated by what's
# provisioned in the production servers.
install_requires=[], # ['numpy==1.11.0', 'scipy==0.17.1', 'pysal==1.11.1', 'scikit-learn==0.17.1'],
install_requires=['numpy==1.11.0', 'scipy==0.17.1', 'pysal==1.11.1', 'scikit-learn==0.17.1'],
requires=['pysal', 'numpy', 'sklearn'],