Skip to content

Commit

Permalink
BLD: Install requests using conda (#725)
Browse files Browse the repository at this point in the history
* BLD: Remove dependency cap on sphinx

* Remove scikit-learn install

* Install certifi from conda

* Add a comment and remove requests installation

* Install requests using conda

* Update .travis.yml

* Re-add sphinx cap
  • Loading branch information
ElDeveloper authored and antgonza committed Jul 31, 2019
1 parent 88fc1c0 commit 027aa16
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ before_install:
- conda update --yes conda

install:
- conda create --yes -n travis python=$TRAVIS_PYTHON_VERSION pip numpy${NUMPY_VERSION} 'scipy>=0.17.0' matplotlib pandas flake8 pep8 jupyter coverage cython
# install requests using conda to avoid a distutils error in certifi
- conda create --yes -n travis python=$TRAVIS_PYTHON_VERSION pip numpy${NUMPY_VERSION} 'scipy>=0.17.0' matplotlib pandas flake8 pep8 jupyter coverage cython scikit-learn requests
- source activate travis
- conda install -c conda-forge phantomjs --yes
# scikit-learn has to be pinned down due to a bug: https://github.com/scikit-learn/scikit-learn/issues/12671
- pip install https://github.com/google/closure-linter/archive/master.zip 'sphinx<1.6' sphinx-bootstrap-theme coveralls 'scikit-learn==0.19.2' --no-binary scikit-learn
- pip install https://github.com/google/closure-linter/archive/master.zip 'sphinx<1.6' sphinx-bootstrap-theme coveralls
- pip install -e '.[all]' --verbose
- npm install -g jsdoc

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
skbio_3 = "scikit-bio >= 0.4.1"
base = ["numpy >= 1.7", "scipy >= 0.17.0", "click", "pandas",
skbio_2, "jinja2 >= 2.9", "future"]
doc = ["Sphinx < 1.6", "sphinx-bootstrap-theme"]
doc = ["Sphinx", "sphinx-bootstrap-theme"]
test = ["pep8", "flake8"]
all_deps = base + doc + test

Expand Down

0 comments on commit 027aa16

Please sign in to comment.