Skip to content

Commit

Permalink
BLD: Fix problem with setup.py and setuptools
Browse files Browse the repository at this point in the history
Fixes biocore#631, thanks to @ikirker for the report and the suggested patch.
  • Loading branch information
ElDeveloper committed Dec 21, 2017
1 parent 2d69390 commit 708de93
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@

skbio_2 = "scikit-bio >= 0.4.1, < 0.5.0"
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"}
test = {"nose >= 0.10.1", "pep8", "flake8"}
all_deps = base | doc | test
base = ["numpy >= 1.7", "scipy >= 0.17.0", "click", "pandas",
skbio_2, "jinja2 >= 2.9", "future"]
doc = ["Sphinx < 1.6", "sphinx-bootstrap-theme"]
test = ["nose >= 0.10.1", "pep8", "flake8"]
all_deps = base + doc + test

# prevent python2 from trying to install skbio >= 0.5.0 (which only works in
# PY3K)
if sys.version_info.major == 3:
base.remove(skbio_2)
base.add(skbio_3)
base.append(skbio_3)

setup(
name='emperor',
Expand Down

0 comments on commit 708de93

Please sign in to comment.