Skip to content

Commit

Permalink
Rename requires files to standard names.
Browse files Browse the repository at this point in the history
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.

Fixes: bug #1179008
Change-Id: I6f8a11988982133249d443403f63b4f8724e156e
  • Loading branch information
niuzhenguo authored and openstack-gerrit committed May 30, 2013
1 parent 82f7d1a commit 47846a7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions tools/install_venv.py
Expand Up @@ -56,8 +56,8 @@ def print_help():
def main(argv):
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
venv = os.path.join(root, '.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 = 'Quantum'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
Expand Down
4 changes: 2 additions & 2 deletions tools/patch_tox_venv.py
Expand Up @@ -25,8 +25,8 @@ def main(argv):

venv = os.environ['VIRTUAL_ENV']

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 = 'quantum'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Expand Up @@ -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
setuptools_git>=0.4
commands =
python tools/patch_tox_venv.py
Expand Down

0 comments on commit 47846a7

Please sign in to comment.