diff options
author | Monty Taylor <mordred@inaugust.com> | 2012-07-18 11:53:48 -0700 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2012-07-18 12:06:24 -0700 |
commit | 5390ac82aa1b9704065d52b397cb5d383f47654f (patch) | |
tree | be1fada338c78420816245e0beee13648056c0ff | |
parent | e8b30afb71369ad09371c6c41ddff79bfcc1b734 (diff) | |
download | pbr-5390ac82aa1b9704065d52b397cb5d383f47654f.tar.gz |
Move dependency processing to version hook.0.4
Change-Id: I2abc9fbdb4dc86032a3d6653869ac93a6aa15883
-rw-r--r-- | pbr/hooks.py | 17 | ||||
-rw-r--r-- | setup.py | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py index f6aab78..d2375df 100644 --- a/pbr/hooks.py +++ b/pbr/hooks.py @@ -37,12 +37,12 @@ def __inject_parsed_file(value, func): value.extend(new_reqs) -def inject_requires(dist, attr, value): - __inject_parsed_file(value, requires.parse_requirements) +def inject_requires(require): + __inject_parsed_file(require, requires.parse_requirements) -def inject_dependency_links(dist, attr, value): - __inject_parsed_file(value, requires.parse_dependency_links) +def inject_dependency_links(require): + __inject_parsed_file(require, requires.parse_dependency_links) def inject_version(dist, attr, value): @@ -55,6 +55,15 @@ def inject_version(dist, attr, value): version = dist.metadata.version if version and version.startswith("#:"): + for require in 'install_requires', 'tests_require': + if require not in dist.__dict__: + dist.__dict__[require] = [] + inject_requires(dist.__dict__[require]) + print dist.__dict__[require] + if 'dependency_links' not in dist.__dict__: + dist.__dict__[require] = [] + inject_dependency_links(dist.__dict__['dependency_links']) + # Modify version number if len(version[2:]) > 0: (version_module, version_object) = version[2:].split(":") @@ -57,8 +57,6 @@ setuptools.setup( entry_points={ "distutils.setup_keywords": [ "version = pbr.hooks:inject_version", - "install_requires = pbr.hooks:inject_requires", - "dependency_links = pbr.hooks:inject_dependency_links", ] } ) |