Rename requires files to standard names

From bug report:
Rename tools/pip-requires to requirements.txt and tools/test-requires
to test-requirements.txt. These are standard files and tools in the
general world are growing intelligence about them.

Change-Id: Ie0bdb4908f45e47db43e84cd0c5fdc5263c035f4
Fixes: Bug #1179008
changes/40/29340/2
Steven Dake 10 years ago
parent 7b224c0fe0
commit 2e1d08eaa1

@ -61,8 +61,7 @@ def get_reqs_from_files(requirements_files):
return []
def parse_requirements(requirements_files=['requirements.txt',
'tools/pip-requires']):
def parse_requirements(requirements_files=['requirements.txt']):
requirements = []
for line in get_reqs_from_files(requirements_files):
# For the requirements list, we need to inject only the portion
@ -90,8 +89,7 @@ def parse_requirements(requirements_files=['requirements.txt',
return requirements
def parse_dependency_links(requirements_files=['requirements.txt',
'tools/pip-requires']):
def parse_dependency_links(requirements_files=['requirements.txt']):
dependency_links = []
# dependency_links inject alternate locations to find packages listed
# in requirements

@ -56,8 +56,8 @@ def main(argv):
if os.environ.get('venv'):
venv = os.environ['venv']
pip_requires = os.path.join(root, 'tools', 'pip-requires')
test_requires = os.path.join(root, 'tools', 'test-requires')
pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'Heat'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,

@ -3,8 +3,8 @@ envlist = py26,py27,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/tools/pip-requires
-r{toxinidir}/tools/test-requires
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
python tools/patch_tox_venv.py
python setup.py testr --slowest --testr-args='{posargs}'

Loading…
Cancel
Save