diff options
| author | Carlos D. Garza <carlos.garza@rackspace.com> | 2013-05-24 17:51:31 -0500 |
|---|---|---|
| committer | Carlos D. Garza <carlos.garza@rackspace.com> | 2013-05-24 17:55:05 -0500 |
| commit | 2bc22ef6f7e21701188eb97376d15c8f57a56881 (patch) | |
| tree | 0e90773ea7454a3799c2391f3911280bbd083f51 /tools | |
| parent | af4e96986f6ee45e9e4ccac0b143902362a1a676 (diff) | |
| download | keystone-2bc22ef6f7e21701188eb97376d15c8f57a56881.tar.gz keystone-2bc22ef6f7e21701188eb97376d15c8f57a56881.tar.xz keystone-2bc22ef6f7e21701188eb97376d15c8f57a56881.zip | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 17 | ||||
| -rw-r--r-- | tools/test-requires | 38 |
3 files changed, 2 insertions, 57 deletions
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 |