Commit faa9b61d authored by Bram Schoenmakers's avatar Bram Schoenmakers

Revert "Move conditional dependencies to install_requires"

This reverts commit bbdfb2a5.

(Wheel) dependencies are evaluated at build time, so they should stay in
extras_require, which are evaluated at install-time.

See issue #79.
parent 33015506
......@@ -20,8 +20,6 @@ def find_version(*file_paths):
return version_match.group(1)
raise RuntimeError("Unable to find version string.")
_PYTHON_VERSION = sys.version_info
_IS_PYTHON_27 = _PYTHON_VERSION.major == 2 and _PYTHON_VERSION.minor == 7
setup(
name = "topydo",
......@@ -34,12 +32,15 @@ setup(
install_requires = [
'six >= 1.9.0',
'arrow >= 0.7.0',
'colorama >= 0.2.5' if sys.platform == "win32" else '',
# shutil.get_terminal_size() was introduced in Python 3.3
'backports.shutil_get_terminal_size>=1.0.0' if _IS_PYTHON_27 else '',
'ushlex' if _IS_PYTHON_27 else ''
],
extras_require = {
':sys_platform=="win32"': ['colorama>=0.2.5'],
# shutil.get_terminal_size() was introduced in Python 3.3
':python_version=="2.7"': [
'backports.shutil_get_terminal_size>=1.0.0',
'ushlex',
],
':python_version=="3.2"': ['backports.shutil_get_terminal_size>=1.0.0'],
'ical': ['icalendar'],
'prompt-toolkit': ['prompt-toolkit >= 0.53'],
'test': ['coverage', 'freezegun', 'green', ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment