Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BLD: Install requests using conda #725

Merged
merged 7 commits into from
Jul 31, 2019
Merged

BLD: Install requests using conda #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f304bfd
BLD: Remove dependency cap on sphinx
ElDeveloper Jul 30, 2019
ecb7d54
Remove scikit-learn install
ElDeveloper Jul 30, 2019
666d528
Install certifi from conda
ElDeveloper Jul 30, 2019
9875c60
Add a comment and remove requests installation
ElDeveloper Jul 30, 2019
022af0f
Install requests using conda
ElDeveloper Jul 30, 2019
66df41f
Update .travis.yml
ElDeveloper Jul 30, 2019
c2a6fbf
Re-add sphinx cap
ElDeveloper Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did not have a super smooth transition from Sphinx 1 -> 2 in QIIME 2, hope this goes better for you...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the heads up, after you posted this comment I looked again and realized that the travis file and setup.py files were out of sync. I fixed that and errors ensued. For now we'll keep it at <1.6. ⏳

This PR now only installs requests using conda, which should solve the broken build we found in #724.

test = ["pep8", "flake8"]
all_deps = base + doc + test

Expand Down