summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-05-18 07:17:04 -0700
committerMonty Taylor <mordred@inaugust.com>2013-05-25 08:23:12 +0200
commit3bbdcda9d23b54079733ff6f06000cf311eff629 (patch)
tree0f420f367fb6e7c40efe9a826a940ca2ff448c5e
parent9d4db6f740fe00f50c77920b5ef7a4fbd08d181f (diff)
downloadpython-novaclient-3bbdcda9d23b54079733ff6f06000cf311eff629.tar.gz
Rename requires files to standard names.
The python community groks requirements.txt and test-requirements.txt as reasonably standard files. We should use those filenames to make our information more discoverable. Fixes bug 1179008 Change-Id: I50a7c46f880e4257fa31d7d322d7bf70b0f5d3a6
-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.py4
-rw-r--r--tox.ini4
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/pip-requires b/requirements.txt
index f7deffed..f7deffed 100644
--- a/tools/pip-requires
+++ b/requirements.txt
diff --git a/tools/test-requires b/test-requirements.txt
index 8da41c8f..8da41c8f 100644
--- a/tools/test-requires
+++ b/test-requirements.txt
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 5742f7e1..8dbab463 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -32,8 +32,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])
diff --git a/tox.ini b/tox.ini
index 3318c089..42cbe267 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]