summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@hp.com>2012-01-05 00:15:33 +0000
committerJames E. Blair <jeblair@hp.com>2012-01-05 00:16:56 +0000
commitbb1aed610f070f6e584c9f624780dedbd85ef809 (patch)
treebde7904ab53dd3d4d03304c7441c5386b4724a51
parent40579d213fd310f9c7a34157f6bf25182c9a69b6 (diff)
Remove install_requires processing.
This is based on a similar change to nova: https://review.openstack.org/#change,2800 Loading install_requires with the contents of pip-requires isn't getting us any real beneift and is causing issues. a) It can conflict with installing keystone into an environment where deps have been installed from packages (devstack) b) It breaks the ability to use -e git urls in pip-requires which we want to start using for python-novaclient and python-keystoneclient c) It causes spurious network traffic when we're trying to test things. At the same time, since we are not expecting anyone to install keystone from setup.py for production, the normal benefit of the feature is not needed. Change-Id: I7235e1bff75a9fd1455daa684300a83c4295bd9c
-rwxr-xr-xsetup.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index 92838c13..b30988c2 100755
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,6 @@ try:
except:
pass
-requirements = ['setuptools', 'httplib2', 'eventlet', 'paste', 'pastedeploy',
- 'webob', 'Routes', 'sqlalchemy', 'sqlalchemy-migrate',
- 'lxml', 'passlib']
-if sys.version_info < (2, 6):
- requirements.append('simplejson')
-
setup(
name='keystone',
version=version.canonical_version(),
@@ -66,7 +60,6 @@ setup(
'bin/keystone-control'],
zip_safe=False,
cmdclass=cmdclass,
- install_requires=requirements,
tests_require=['nose', 'unittest2', 'webtest', 'mox', 'pylint', 'pep8'],
test_suite='keystone.test.runtests',
entry_points={