From a78ccce8794552eeae716022870925e601f6a542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoshiki=20V=C3=A1zquez=20Baeza?= Date: Thu, 21 Dec 2017 13:46:04 -0500 Subject: [PATCH] BLD: Fix problem with setup.py and setuptools (#637) Fixes #631, thanks to @ikirker for the report and the suggested patch. --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index ffe06aac..d26e48ce 100644 --- a/setup.py +++ b/setup.py @@ -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',