From bac0718764ac5e7cc22adf24d035db0be0cf90d9 Mon Sep 17 00:00:00 2001
From: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date: Wed, 29 May 2013 17:36:23 +0800
Subject: 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/install_venv.py |  4 ++--
 tools/pip-requires    |  9 ---------
 tools/test-requires   | 16 ----------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 tools/pip-requires
 delete mode 100644 tools/test-requires

(limited to 'tools')

diff --git a/tools/install_venv.py b/tools/install_venv.py
index d247c023..a5891d67 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/tools/pip-requires b/tools/pip-requires
deleted file mode 100644
index fe30e2dd..00000000
--- a/tools/pip-requires
+++ /dev/null
@@ -1,9 +0,0 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-cliff
-keyring
-pycrypto
-python-glanceclient>=0.9.0,<2
-python-keystoneclient>=0.2,<1.0
-python-novaclient>=2
-python-cinderclient>=1
diff --git a/tools/test-requires b/tools/test-requires
deleted file mode 100644
index 1eb2509c..00000000
--- a/tools/test-requires
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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
-
-distribute>=0.6.24
-
-coverage
-discover
-fixtures>=0.3.12
-mock
-openstack.nose_plugin
-sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.26
-- 
cgit v1.2.1