From 627d0ba52f8f04765e09c9fe0974a2308ee6def3 Mon Sep 17 00:00:00 2001
From: niu-zglinux <Niu.ZGlinux@gmail.com>
Date: Wed, 29 May 2013 22:03:40 +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: Ib3e50a811868e2969923d978ee00c4f92682aa1c
Fixes: bug #1179008
---
 tools/pip-requires => requirements.txt       | 0
 setup.py                                     | 2 +-
 tools/test-requires => test-requirements.txt | 0
 tox.ini                                      | 4 ++--
 4 files changed, 3 insertions(+), 3 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/setup.py b/setup.py
index 29f486542a..6c4c2328c1 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from swift import __canonical_version__ as version
 name = 'swift'
 
 
-with open('tools/pip-requires', 'r') as f:
+with open('requirements.txt', 'r') as f:
     requires = [x.strip() for x in f if x.strip()]
 
 
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/tox.ini b/tox.ini
index c6e6131096..c093e0d049 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_SHOW_ELAPSED=1
          NOSE_OPENSTACK_STDOUT=1
 deps =
-  -r{toxinidir}/tools/pip-requires
-  -r{toxinidir}/tools/test-requires
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands = nosetests test/unit {posargs}
 
 [tox:jenkins]