From 027aa16f1dcf9536cd2dd9c9800ece5fc359ecbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoshiki=20V=C3=A1zquez=20Baeza?= Date: Wed, 31 Jul 2019 11:54:41 -0700 Subject: [PATCH] BLD: Install requests using conda (#725) * 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 --- .travis.yml | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c537af4d..ff3d6e2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/setup.py b/setup.py index 2c9272ae..de39325e 100644 --- a/setup.py +++ b/setup.py @@ -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