Move setuptools-git dependency from being a requires of pbr, to being a

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
This commit is contained in:
Robert Collins 2012-09-30 17:08:09 +13:00
parent 196198475c
commit f3e6689c9c
3 changed files with 7 additions and 1 deletions

2
.gitignore vendored
View File

@ -3,6 +3,8 @@
*.pyc
*.pyo
*.sqlite
*~
*.swp
.autogenerated
.coverage
.project

View File

@ -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):

View File

@ -1 +0,0 @@
setuptools_git>=0.4