[06/10] incubator-ariatosca git commit: ARIA-301 Fix issue when installing from wheel

[mx...@apache.org]

ARIA-301 Fix issue when installing from wheel

Fixed an issue when installing ARIA from wheel where
environment-marked dependencies would install regardless
of the environment ARIA is installed on.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9de6bf56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9de6bf56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9de6bf56

Branch: refs/heads/new_wagon_setuptools
Commit: 9de6bf563a3e826a56b9e440a379ee468822afd9
Parents: f0bd8b4
Author: Ran Ziv <ra...@gigaspaces.com>
Authored: Thu Jul 6 18:59:42 2017 +0300
Committer: Ran Ziv <ra...@gigaspaces.com>
Committed: Mon Jul 10 17:00:40 2017 +0300

----------------------------------------------------------------------
 setup.py | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9de6bf56/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 340cce2..8e95c19 100644
--- a/setup.py
+++ b/setup.py
@@ -45,21 +45,39 @@ with open(os.path.join(root_dir, 'README.rst')) as readme:
 
 install_requires = []
 
-# We need to parse the requirements for the conditional dependencies to work for wheels creation
-# as well as source dist installation
-with open(os.path.join(root_dir, 'requirements.in')) as requirements:
-    for requirement in requirements.readlines():
-        install_requires.append(requirement.strip())
-
 ssh_requires = [
     'Fabric>=1.13.0, <1.14',
-    "pypiwin32==219 ; sys_platform == 'win32'"
+]
+win_ssh_requires = [
+    # Fabric depends on the pypiwin32 on Windows, but doesn't install it
+    'pypiwin32==219'
 ]
 
 extras_require = {
-    'ssh': ssh_requires
+    'ssh': ssh_requires,
+    'ssh:sys_platform=="win32"': win_ssh_requires
 }
 
+with open(os.path.join(root_dir, 'requirements.in')) as requirements:
+    for requirement in requirements.readlines():
+        requirement = requirement.split('#')[0].strip()  # get rid of comments or trailing comments
+        if not requirement:
+            continue  # skip empty and comment lines
+
+        # dependencies which use environment markers have to go in as conditional dependencies
+        # under "extra_require" rather than "install_requires", or otherwise the environment
+        # markers get ignored when installing from wheel. See more here:
+        # https://wheel.readthedocs.io/en/latest/index.html#defining-conditional-dependencies
+        # https://hynek.me/articles/conditional-python-dependencies/
+        if ';' in requirement:
+            package, condition = requirement.split(';')
+            cond_name = ':{0}'.format(condition.strip())
+            extras_require.setdefault(cond_name, [])
+            extras_require[cond_name].append(package.strip())
+        else:
+            install_requires.append(requirement)
+
+
 console_scripts = ['aria = aria.cli.main:main']