summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2018-03-28 17:57:33 -0400
committerTodd Leonhardt <todd.leonhardt@gmail.com>2018-03-28 17:57:33 -0400
commitfd1463967a38289c16a568b1794bc2bc3ad51924 (patch)
tree85554484d6f0203163590fb54bda49da99f14efa
parent92ab77c0dcde350e0d9233d6987f83e812e14daa (diff)
downloadcmd2-git-fd1463967a38289c16a568b1794bc2bc3ad51924.tar.gz
Add conditional dependency on enum34 for Python 2.7
-rw-r--r--docs/requirements.txt2
-rwxr-xr-xsetup.py4
-rw-r--r--tox.ini2
3 files changed, 8 insertions, 0 deletions
diff --git a/docs/requirements.txt b/docs/requirements.txt
index b50df7d1..b8cf9271 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,3 +2,5 @@ pyparsing
six
pyperclip
contextlib2
+enum34
+subprocess32
diff --git a/setup.py b/setup.py
index 44268767..8107552d 100755
--- a/setup.py
+++ b/setup.py
@@ -71,6 +71,8 @@ EXTRAS_REQUIRE = {
":sys_platform=='win32'": ['pyreadline'],
# Python 3.4 and earlier require contextlib2 for temporarily redirecting stderr and stdout
":python_version<'3.5'": ['contextlib2'],
+ # Python 3.3 and earlier require enum34 backport of enum module from Python 3.4
+ ":python_version<'3.4'": ['enum34'],
# Python 2.7 also requires subprocess32
":python_version<'3.0'": ['subprocess32'],
}
@@ -81,6 +83,8 @@ if int(setuptools.__version__.split('.')[0]) < 18:
INSTALL_REQUIRES.append('pyreadline')
if sys.version_info < (3, 5):
INSTALL_REQUIRES.append('contextlib2')
+ if sys.version_info < (3, 4):
+ INSTALL_REQUIRES.append('enum34')
if sys.version_info < (3, 0):
INSTALL_REQUIRES.append('subprocess32')
diff --git a/tox.ini b/tox.ini
index 77a4ad69..1be182f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ setenv =
[testenv:py27]
deps =
codecov
+ enum34
mock
pyparsing
pyperclip
@@ -28,6 +29,7 @@ commands =
[testenv:py27-win]
deps =
codecov
+ enum34
mock
pyparsing
pyperclip