diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-05-18 09:18:07 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-05-20 14:32:32 -0400 |
| commit | c82a811301d78ecdabf7786e0c5cee10879db87f (patch) | |
| tree | de63067d462221f4ac82c9fbbed0becf969c7c5c | |
| parent | aa2808337b5fd1e585a38b16eff7a495f1ff99f4 (diff) | |
| download | python-cinderclient-c82a811301d78ecdabf7786e0c5cee10879db87f.tar.gz | |
Rename requires files to standard names.
Fixes bug 1179008.
Change-Id: I6765bb82df1ae672790662a30ee3527450685036
| -rw-r--r-- | requirements.txt (renamed from tools/pip-requires) | 0 | ||||
| -rw-r--r-- | test-requirements.txt (renamed from tools/test-requires) | 0 | ||||
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/pip-requires b/requirements.txt index d677ca2..d677ca2 100644 --- a/tools/pip-requires +++ b/requirements.txt diff --git a/tools/test-requires b/test-requirements.txt index 74be769..74be769 100644 --- a/tools/test-requires +++ b/test-requirements.txt diff --git a/tools/install_venv.py b/tools/install_venv.py index db0e32b..f22c18d 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -31,8 +31,8 @@ import platform 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]) @@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir} 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] |