diff options
author | kotfu <kotfu@kotfu.net> | 2018-04-19 21:51:24 -0600 |
---|---|---|
committer | kotfu <kotfu@kotfu.net> | 2018-04-19 21:51:24 -0600 |
commit | 477666d0b3e097fb831729644b8861a983805981 (patch) | |
tree | 02217d3d2bb03499e511d8dd1774d161bb019a0f /setup.py | |
parent | b7cfb130c7c914478936366b748b04234b031119 (diff) | |
parent | 58fdd089cc064e71502dc1f094fd906d30523886 (diff) | |
download | cmd2-git-477666d0b3e097fb831729644b8861a983805981.tar.gz |
Merge branch 'master' into ply
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -61,7 +61,7 @@ Programming Language :: Python :: Implementation :: PyPy3 Topic :: Software Development :: Libraries :: Python Modules """.splitlines()))) -INSTALL_REQUIRES = ['pyparsing >= 2.1.0', 'pyperclip >= 1.5.27'] +INSTALL_REQUIRES = ['pyparsing >= 2.1.0', 'pyperclip >= 1.5.27', 'colorama'] EXTRAS_REQUIRE = { # Windows also requires pyreadline to ensure tab completion works @@ -69,7 +69,7 @@ EXTRAS_REQUIRE = { # POSIX OSes also require wcwidth for correctly estimating the displayed width of unicode chars ":sys_platform!='win32'": ['wcwidth'], # Python 3.4 and earlier require contextlib2 for temporarily redirecting stderr and stdout - ":python_version<'3.5'": ['contextlib2'], + ":python_version<'3.5'": ['contextlib2', 'typing'], } if int(setuptools.__version__.split('.')[0]) < 18: @@ -80,6 +80,7 @@ if int(setuptools.__version__.split('.')[0]) < 18: INSTALL_REQUIRES.append('wcwidth') if sys.version_info < (3, 5): INSTALL_REQUIRES.append('contextlib2') + INSTALL_REQUIRES.append('typing') TESTS_REQUIRE = ['pytest', 'pytest-xdist'] DOCS_REQUIRE = ['sphinx', 'sphinx_rtd_theme', 'pyparsing', 'pyperclip', 'wcwidth'] |