diff options
| author | Andy Smith <github@anarkystic.com> | 2012-01-27 03:50:49 -0800 |
|---|---|---|
| committer | Andy Smith <github@anarkystic.com> | 2012-01-27 03:50:49 -0800 |
| commit | d23691b78b0491fad9fb2e2e02c4d99d4bbf34a0 (patch) | |
| tree | cfc4f53bf3663dfa8a9243f9ebf3865a3d998482 | |
| parent | 20243af977061ebee25e0383b8a789b056e19fd8 (diff) | |
| parent | 68aa9cd10fca548dcbf2a8a58d7cf902a1af655b (diff) | |
Merge pull request #25 from 4P/pipup
fixing up PIP requirements for testing and virtualenv
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 2 | ||||
| -rw-r--r-- | tools/pip-requires-test | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -10,5 +10,5 @@ setup(name='keystone', packages=find_packages(exclude=['test', 'bin']), scripts=['bin/keystone', 'bin/keystone-manage'], zip_safe=False, - install_requires=['setuptools'], + install_requires = ['setuptools', 'python-keystoneclient'], ) diff --git a/tools/pip-requires b/tools/pip-requires index d4157f8e..c075d369 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -4,7 +4,7 @@ eventlet==0.9.12 PasteDeploy paste routes -pycli +pyCLI sqlalchemy sqlalchemy-migrate py-bcrypt diff --git a/tools/pip-requires-test b/tools/pip-requires-test index 563eaa2c..e40795c8 100644 --- a/tools/pip-requires-test +++ b/tools/pip-requires-test @@ -5,8 +5,10 @@ eventlet==0.9.12 PasteDeploy paste routes +pyCLI sqlalchemy sqlalchemy-migrate +py-bcrypt # keystonelight testing dependencies nose @@ -15,6 +17,7 @@ nosexcover # for python-keystoneclient httplib2 pep8 +-e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient # for python-novaclient prettytable |