openstack/requirements
Code Issues Proposed changes

Merge "Add flag to include hacking"

Browse Source
This commit is contained in:
Jenkins 2015-05-26 07:59:21 +00:00 committed by Gerrit Code Review
commit e88d2d19b3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
update.py
View File

@ -138,7 +138,7 @@ def _parse_reqs(filename):
def _sync_requirements_file(source_reqs, dev_reqs, dest_path, def _sync_requirements_file(source_reqs, dev_reqs, dest_path,
suffix, softupdate): suffix, softupdate, hacking):
dest_reqs = _readlines(dest_path) dest_reqs = _readlines(dest_path)
changes = [] changes = []
# this is specifically for global-requirements gate jobs so we don't # this is specifically for global-requirements gate jobs so we don't
@ -165,7 +165,7 @@ def _sync_requirements_file(source_reqs, dev_reqs, dest_path,
# Special cases: # Special cases:
# projects need to align hacking version on their own time # projects need to align hacking version on their own time
if "hacking" in old_pip: if "hacking" in old_pip and not hacking:
new_reqs.write(old_line) new_reqs.write(old_line)
continue continue
@ -209,7 +209,7 @@ def _sync_requirements_file(source_reqs, dev_reqs, dest_path,
print(" %s" % change) print(" %s" % change)
def _copy_requires(suffix, softupdate, dest_dir): def _copy_requires(suffix, softupdate, hacking, dest_dir):
"""Copy requirements files.""" """Copy requirements files."""
source_reqs = _parse_reqs('global-requirements.txt') source_reqs = _parse_reqs('global-requirements.txt')
@ -227,7 +227,7 @@ def _copy_requires(suffix, softupdate, dest_dir):
dest_path = os.path.join(dest_dir, dest) dest_path = os.path.join(dest_dir, dest)
if os.path.exists(dest_path): if os.path.exists(dest_path):
_sync_requirements_file(source_reqs, dev_reqs, dest_path, _sync_requirements_file(source_reqs, dev_reqs, dest_path,
suffix, softupdate) suffix, softupdate, hacking)
def _write_setup_py(dest_path): def _write_setup_py(dest_path):
@ -252,7 +252,8 @@ def main(options, args):
sys.exit(1) sys.exit(1)
global VERBOSE global VERBOSE
VERBOSE = options.verbose VERBOSE = options.verbose
_copy_requires(options.suffix, options.softupdate, args[0]) _copy_requires(options.suffix, options.softupdate, options.hacking,
args[0])
_write_setup_py(args[0]) _write_setup_py(args[0])
@ -263,6 +264,9 @@ if __name__ == "__main__":
parser.add_option("-s", "--soft-update", dest="softupdate", parser.add_option("-s", "--soft-update", dest="softupdate",
action="store_true", action="store_true",
help="Pass through extra requirements without warning.") help="Pass through extra requirements without warning.")
parser.add_option("-H", "--hacking", dest="hacking",
action="store_true",
help="Include the hacking project.")
parser.add_option("-v", "--verbose", dest="verbose", parser.add_option("-v", "--verbose", dest="verbose",
action="store_true", action="store_true",
help="Add further verbosity to output") help="Add further verbosity to output")