From 2bc22ef6f7e21701188eb97376d15c8f57a56881 Mon Sep 17 00:00:00 2001
From: "Carlos D. Garza" <carlos.garza@rackspace.com>
Date: Fri, 24 May 2013 17:51:31 -0500
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.

Fixes: bug #1179008
Change-Id: I1a19f0c73ab48987e2ff0dade1a57a68b65f0a22
---
 .gitignore                |  1 -
 doc/source/installing.rst |  2 +-
 doc/source/setup.rst      |  8 ++++----
 requirements.txt          | 17 +++++++++++++++++
 run_tests.sh              |  2 +-
 test-requirements.txt     | 38 ++++++++++++++++++++++++++++++++++++++
 tools/install_venv.py     |  4 ++--
 tools/pip-requires        | 17 -----------------
 tools/test-requires       | 38 --------------------------------------
 tox.ini                   |  4 ++--
 10 files changed, 65 insertions(+), 66 deletions(-)
 create mode 100644 requirements.txt
 create mode 100644 test-requirements.txt
 delete mode 100644 tools/pip-requires
 delete mode 100644 tools/test-requires

diff --git a/.gitignore b/.gitignore
index 0cce8974..97665029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ doc/build
 doc/source/modules.rst
 doc/source/keystone.*
 ChangeLog
-requirements.txt
 AUTHORS
 build/
 dist/
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index eeb4158b..dff824f1 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -49,7 +49,7 @@ Clone the keystone repository::
 
 Install the dependencies to run keystone::
 
-    sudo pip install -r tools/pip-requires
+    sudo pip install -r requirements.txt
 
 And at this point, you should have all the pieces you need to run keystone
 installed on your system. The following commands should be available on the
diff --git a/doc/source/setup.rst b/doc/source/setup.rst
index 35727222..cc6762c8 100644
--- a/doc/source/setup.rst
+++ b/doc/source/setup.rst
@@ -66,8 +66,8 @@ Installing dependencies
 
 Keystone maintains two lists of dependencies::
 
-    tools/pip-requires
-    tools/test-requires
+    requirements.txt
+    test-requirements.txt
 
 The first is the list of dependencies needed for running keystone, the second list includes dependencies used for active development and testing of keystone itself.
 
@@ -124,10 +124,10 @@ If you want to run keystone outside of a virtualenv, you can install the
 dependencies directly into your system from the requires files::
 
     # Install the dependencies for running keystone
-    $ pip install -r tools/pip-requires
+    $ pip install -r requirements.txt
 
     # Install the dependencies for developing, testing, and running keystone
-    $ pip install -r tools/test-requires
+    $ pip install -r test-requirements.txt
 
     # Use python setup.py to link Keystone into python's site-packages
     $ python setup.py develop
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..af5d2831
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,17 @@
+# keystone dependencies
+d2to1>=0.2.10,<0.3
+pbr>=0.5,<0.6
+pam>=0.1.4
+WebOb==1.2.3
+eventlet
+greenlet
+PasteDeploy
+paste
+routes
+sqlalchemy>=0.7.8,<=0.7.9
+sqlalchemy-migrate>=0.7.2
+passlib
+lxml
+iso8601>=0.1.4
+python-keystoneclient>=0.2.1,<0.3
+oslo.config>=1.1.0
diff --git a/run_tests.sh b/run_tests.sh
index baba4f4b..f9193b68 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -129,7 +129,7 @@ function run_pep8 {
   echo "Running pep8 ..."
   # Opt-out files from pep8
   ignore_scripts="*.pyc,*.pyo,*.sh,*.swp,*.rst"
-  ignore_files="*pip-requires"
+  ignore_files="*.txt"
   ignore_dirs=".venv,.tox,dist,doc,openstack,vendor,*egg"
   ignore="$ignore_scripts,$ignore_files,$ignore_dirs"
   srcfiles="."
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..936eb90c
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,38 @@
+# 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
+
+# Optional backend: SQL
+pysqlite
+
+# Optional backend: Memcache
+python-memcached
+
+# Optional backend: LDAP
+python-ldap==2.3.13 # authenticate against an existing LDAP server
+
+# Testing
+coverage # computes code coverage percentages
+mox # mock object framework
+nose # for test discovery and console feedback
+nosexcover
+openstack.nose_plugin
+nosehtmloutput
+Sphinx>=1.1.2 # required to build documentation
+unittest2 # backport of unittest lib in python 2.7
+webtest # test wsgi apps without starting an http server
+distribute>=0.6.24
+
+# for python-keystoneclient
+httplib2 # keystoneclient <0.2.1
+requests>=1.0.0 # replaces httplib2 in keystoneclient >=0.2.1
+keyring
+
+# swift_auth test dependencies
+http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
+netifaces
+
+# For translations processing
+Babel
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 05a999be..136988f6 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -54,8 +54,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 = 'Keystone'
     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 af5d2831..00000000
--- a/tools/pip-requires
+++ /dev/null
@@ -1,17 +0,0 @@
-# keystone dependencies
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-pam>=0.1.4
-WebOb==1.2.3
-eventlet
-greenlet
-PasteDeploy
-paste
-routes
-sqlalchemy>=0.7.8,<=0.7.9
-sqlalchemy-migrate>=0.7.2
-passlib
-lxml
-iso8601>=0.1.4
-python-keystoneclient>=0.2.1,<0.3
-oslo.config>=1.1.0
diff --git a/tools/test-requires b/tools/test-requires
deleted file mode 100644
index 936eb90c..00000000
--- a/tools/test-requires
+++ /dev/null
@@ -1,38 +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
-
-# Optional backend: SQL
-pysqlite
-
-# Optional backend: Memcache
-python-memcached
-
-# Optional backend: LDAP
-python-ldap==2.3.13 # authenticate against an existing LDAP server
-
-# Testing
-coverage # computes code coverage percentages
-mox # mock object framework
-nose # for test discovery and console feedback
-nosexcover
-openstack.nose_plugin
-nosehtmloutput
-Sphinx>=1.1.2 # required to build documentation
-unittest2 # backport of unittest lib in python 2.7
-webtest # test wsgi apps without starting an http server
-distribute>=0.6.24
-
-# for python-keystoneclient
-httplib2 # keystoneclient <0.2.1
-requests>=1.0.0 # replaces httplib2 in keystoneclient >=0.2.1
-keyring
-
-# swift_auth test dependencies
-http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
-netifaces
-
-# For translations processing
-Babel
diff --git a/tox.ini b/tox.ini
index 401ec901..1dfa2f62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
          NOSE_OPENSTACK_STDOUT=1
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs}
 
 [testenv:pep8]
-- 
cgit