diff options
author | Gary Kotton <gkotton@redhat.com> | 2013-06-12 13:20:46 +0000 |
---|---|---|
committer | Gary Kotton <gkotton@redhat.com> | 2013-06-12 13:22:31 +0000 |
commit | 6261364651966fe767b592fc32c6e263ffec1d7f (patch) | |
tree | 7e1cc624afdffcfcf57b49535fccb97cd8289046 /tools | |
parent | bcb9ea7ba4b4b1651f5ed430a2fb533dd2fdce6c (diff) | |
download | neutron-6261364651966fe767b592fc32c6e263ffec1d7f.tar.gz |
Update with latest OSLO code
Change-Id: I54c0f6fa0489f0ef20187adf87f720e48ce1626c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/patch_tox_venv.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index 01ea05afb1..16e4accdd5 100644 --- a/tools/patch_tox_venv.py +++ b/tools/patch_tox_venv.py @@ -20,13 +20,25 @@ import sys import install_venv_common as install_venv +def first_file(file_list): + for candidate in file_list: + if os.path.exists(candidate): + return candidate + + def main(argv): root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) venv = os.environ['VIRTUAL_ENV'] - pip_requires = os.path.join(root, 'requirements.txt') - test_requires = os.path.join(root, 'test-requirements.txt') + pip_requires = first_file([ + os.path.join(root, 'requirements.txt'), + os.path.join(root, 'tools', 'pip-requires'), + ]) + test_requires = first_file([ + os.path.join(root, 'test-requirements.txt'), + os.path.join(root, 'tools', 'test-requires'), + ]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) project = 'quantum' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, |