diff options
| author | Robert Collins <robertc@robertcollins.net> | 2012-09-30 17:08:09 +1300 |
|---|---|---|
| committer | Robert Collins <robertc@robertcollins.net> | 2012-09-30 17:33:12 +1300 |
| commit | f3e6689c9c74bcf0d2cc1f641759553710e092ba (patch) | |
| tree | d9ac9d0fa42f1046087c8e72bf19263c908a9653 | |
| parent | 196198475cfcbe9c29bc8374c446daf0c0a0bb4a (diff) | |
| download | pbr-0.4.5.tar.gz | |
Move setuptools-git dependency from being a requires of pbr, to being a0.4.5
requires of anything pbr supplies dependencies for via the inject_requires
hook. (parse_requires is unaffected). Fixes bug 1058806.
Also ignore vim droppings.
Change-Id: I3b5328a7aeba967e6b64e4c200bcaf156ba2fd15
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | pbr/hooks.py | 5 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -3,6 +3,8 @@ *.pyc *.pyo *.sqlite +*~ +*.swp .autogenerated .coverage .project diff --git a/pbr/hooks.py b/pbr/hooks.py index ea2166c..20439d7 100644 --- a/pbr/hooks.py +++ b/pbr/hooks.py @@ -35,6 +35,11 @@ def __inject_parsed_file(value, func): for val in old_tokens: value.remove(val) value.extend(new_reqs) + # Ensure that generating a manifest from any 'setup.py develop' + # bootstrapped environment gets a git based MANIFEST. Ideally this + # would only apply to 'setup.py develop' rather than simple installation + # - but its a small dependency with no recursive dependencies. + value.append('setuptools_git>=0.4') def inject_requires(dist, attr, value): diff --git a/tools/pip-requires b/tools/pip-requires index 160b352..e69de29 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1 +0,0 @@ -setuptools_git>=0.4 |