summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-05-18 09:18:07 -0700
committerMonty Taylor <mordred@inaugust.com>2013-05-20 14:32:32 -0400
commitc82a811301d78ecdabf7786e0c5cee10879db87f (patch)
treede63067d462221f4ac82c9fbbed0becf969c7c5c /tools
parentaa2808337b5fd1e585a38b16eff7a495f1ff99f4 (diff)
downloadpython-cinderclient-c82a811301d78ecdabf7786e0c5cee10879db87f.tar.gz
Rename requires files to standard names.
Fixes bug 1179008. Change-Id: I6765bb82df1ae672790662a30ee3527450685036
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py4
-rw-r--r--tools/pip-requires6
-rw-r--r--tools/test-requires15
3 files changed, 2 insertions, 23 deletions
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])
diff --git a/tools/pip-requires b/tools/pip-requires
deleted file mode 100644
index d677ca2..0000000
--- a/tools/pip-requires
+++ /dev/null
@@ -1,6 +0,0 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-argparse
-prettytable>=0.6,<0.8
-requests>=0.8
-simplejson>=2.0.9
diff --git a/tools/test-requires b/tools/test-requires
deleted file mode 100644
index 74be769..0000000
--- a/tools/test-requires
+++ /dev/null
@@ -1,15 +0,0 @@
-distribute>=0.6.24
-
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.3,<0.6
-
-coverage
-discover
-fixtures
-mock
-sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.22