summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-07-19 16:16:59 +0000
committerGerrit Code Review <review@openstack.org>2012-07-19 16:16:59 +0000
commitcec186793b2314b90ac57efa4b2aa8873381bfff (patch)
treea5622112c5c37512bc11c78181d1da251a8888bd
parent5390ac82aa1b9704065d52b397cb5d383f47654f (diff)
downloadpbr-cec186793b2314b90ac57efa4b2aa8873381bfff.tar.gz
Revert "Move dependency processing to version hook."
This reverts commit 5390ac82aa1b9704065d52b397cb5d383f47654f
-rw-r--r--pbr/hooks.py17
-rw-r--r--setup.py2
2 files changed, 6 insertions, 13 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py
index d2375df..f6aab78 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(require):
- __inject_parsed_file(require, requires.parse_requirements)
+def inject_requires(dist, attr, value):
+ __inject_parsed_file(value, requires.parse_requirements)
-def inject_dependency_links(require):
- __inject_parsed_file(require, requires.parse_dependency_links)
+def inject_dependency_links(dist, attr, value):
+ __inject_parsed_file(value, requires.parse_dependency_links)
def inject_version(dist, attr, value):
@@ -55,15 +55,6 @@ 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(":")
diff --git a/setup.py b/setup.py
index dcd3271..fd59a07 100644
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,8 @@ 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",
]
}
)