openstack/requirements
Code Issues Proposed changes

Align projects list with mirror-needing projects

Browse Source 
If projects.txt is going to be the basis for select-mirror in the
gate, we should also list projects in projects.txt that need to be
constrained by the mirror for their testing. In order to do that, we
need to not try to unconditionally update setup.py, since devstack and
devstack-gate do not have it.

openstack/requirements itself also does not use the mirror, so remove
it from the list.

Change-Id: Iea33e8f4d5453bf413f3d479b85eaed99938b302
This commit is contained in:
Monty Taylor 2013-11-29 10:02:55 -05:00
parent 741bfc42b4
commit cc7031c27e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects.txt
View File

@ -26,7 +26,6 @@ openstack/python-openstackclient
openstack/python-savannaclient openstack/python-savannaclient
openstack/python-swiftclient openstack/python-swiftclient
openstack/python-troveclient openstack/python-troveclient
openstack/requirements
openstack/savanna openstack/savanna
openstack/savanna-dashboard openstack/savanna-dashboard
openstack/savanna-image-elements openstack/savanna-image-elements
@ -34,7 +33,9 @@ openstack/savanna-extra
openstack/swift openstack/swift
openstack/tempest openstack/tempest
openstack/trove openstack/trove
openstack-dev/devstack
openstack-dev/hacking openstack-dev/hacking
openstack-infra/devstack-gate
stackforge/climate stackforge/climate
stackforge/solum stackforge/solum
stackforge/python-climateclient stackforge/python-climateclient

5
update.py
View File

@ -149,10 +149,13 @@ def _copy_requires(suffix, dest_dir):
def _write_setup_py(dest_path): def _write_setup_py(dest_path):
print("Syncing setup.py")
target_setup_py = os.path.join(dest_path, 'setup.py') target_setup_py = os.path.join(dest_path, 'setup.py')
# If it doesn't have a setup.py, then we don't want to update it
if not os.path.exists(target_setup_py):
return
has_pbr = 'pbr' in open(target_setup_py, 'r').read() has_pbr = 'pbr' in open(target_setup_py, 'r').read()
if has_pbr: if has_pbr:
print("Syncing setup.py")
# We only want to sync things that are up to date with pbr mechanics # We only want to sync things that are up to date with pbr mechanics
with open(target_setup_py, 'w') as setup_file: with open(target_setup_py, 'w') as setup_file:
setup_file.write(_setup_py_text) setup_file.write(_setup_py_text)