From 0b739a2547b35c1d1454c53b4bec23e833325af2 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 26 Jul 2018 07:14:08 -0700 Subject: Revert "Switched to extra_requires for Python 2 specific requirements" This reverts commit 2e4ab7a6e26db79a2e65d420543469bd415a99e9. --- setup.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b045f6d6c7..388e629ec2 100644 --- a/setup.py +++ b/setup.py @@ -279,6 +279,9 @@ INSTALL_REQUIRES = ( 'six>=1.5.2', ) +if not PY3: + INSTALL_REQUIRES += ('futures>=2.2.0', 'enum34>=1.0.4') + SETUP_REQUIRES = INSTALL_REQUIRES + ( 'sphinx>=1.3', 'sphinx_rtd_theme>=0.1.8', @@ -343,10 +346,4 @@ setuptools.setup( install_requires=INSTALL_REQUIRES, setup_requires=SETUP_REQUIRES, cmdclass=COMMAND_CLASS, - extra_requires={ - ':python_version < "3"': [ - 'futures>=2.2.0', - 'enum34>=1.0.4' - ] - }, ) -- cgit v1.2.3