You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by mx...@apache.org on 2017/02/01 17:26:39 UTC
incubator-ariatosca git commit:
ARIA-95-pip-wheel-for-aria-ignores-dependencies
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-95-pip-wheel-for-aria-ignores-dependencies [created] 0cb71376c
ARIA-95-pip-wheel-for-aria-ignores-dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/0cb71376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0cb71376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0cb71376
Branch: refs/heads/ARIA-95-pip-wheel-for-aria-ignores-dependencies
Commit: 0cb71376c7bbe7c70764a5e5c75319bf368836c6
Parents: 9b01654
Author: mxmrlv <mx...@gmail.com>
Authored: Wed Feb 1 19:26:27 2017 +0200
Committer: mxmrlv <mx...@gmail.com>
Committed: Wed Feb 1 19:26:27 2017 +0200
----------------------------------------------------------------------
setup.py | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0cb71376/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 36f84c9..0618c70 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
import os
import sys
-from setuptools import setup, find_packages, Command
+from setuptools import setup, find_packages
from setuptools.command.install import install
_PACKAGE_NAME = 'aria'
@@ -38,11 +38,25 @@ version = '0.1.0'
execfile(os.path.join(root_dir, _PACKAGE_NAME, 'VERSION.py'))
+install_requires = []
+extras_require = {}
+
+# We need to parse the requirements for the conditional dependencies to work for wheels and
+# standard installation
try:
with open(os.path.join(root_dir, 'requirements.txt')) as requirements:
- install_requires = [requirement.strip() for requirement in requirements.readlines()]
+ for requirement in requirements.readlines():
+ if not requirement.strip().startswith('#'):
+ 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.strip())
except IOError:
install_requires = []
+ extras_require = {}
console_scripts = ['aria = aria.cli.cli:main']
@@ -95,6 +109,7 @@ setup(
},
zip_safe=False,
install_requires=install_requires,
+ extras_require=extras_require,
entry_points={
'console_scripts': console_scripts
},