From bac0718764ac5e7cc22adf24d035db0be0cf90d9 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Wed, 29 May 2013 17:36:23 +0800 Subject: [PATCH] Rename requires files to standard names. 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: I903213fda94a833335abaa7ad9a90bbb688ec15a Fixes: bug #1179008 --- tools/pip-requires => requirements.txt | 0 tools/test-requires => test-requirements.txt | 0 tools/install_venv.py | 4 ++-- tox.ini | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename tools/pip-requires => requirements.txt (100%) rename tools/test-requires => test-requirements.txt (100%) diff --git a/tools/pip-requires b/requirements.txt similarity index 100% rename from tools/pip-requires rename to requirements.txt diff --git a/tools/test-requires b/test-requirements.txt similarity index 100% rename from tools/test-requires rename to test-requirements.txt diff --git a/tools/install_venv.py b/tools/install_venv.py index d247c02376..a5891d6710 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -48,8 +48,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 = "python-openstackclient" install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, diff --git a/tox.ini b/tox.ini index f6de18d137..ece55df54b 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,8 @@ setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=C -deps = -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python setup.py testr --testr-args='{posargs}' [testenv:pep8]