renaming pip-requires-test to test-requires
* (per request from jeblair) * version of python-ldap match between test and requires * pinned to 2.3.13 to let tests work in macosx * separating dependencies between deps and test * removed python-keystoneclient from install_requires for now. (there is no python-keystoneclient in PyPI) Real solution coming. Change-Id: I89e50d6747fb57dee7badb17bc1231d3619e3ef7
This commit is contained in:
parent
9581809f88
commit
5816542c0e
|
@ -65,7 +65,7 @@ Installing dependencies
|
||||||
Keystone maintains two lists of dependencies::
|
Keystone maintains two lists of dependencies::
|
||||||
|
|
||||||
tools/pip-requires
|
tools/pip-requires
|
||||||
tools/pip-requires-test
|
tools/test-requires
|
||||||
|
|
||||||
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.
|
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.
|
||||||
|
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -12,5 +12,5 @@ setup(name='keystone',
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
scripts=['bin/keystone-all', 'bin/keystone-manage'],
|
scripts=['bin/keystone-all', 'bin/keystone-manage'],
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
install_requires=['setuptools', 'python-keystoneclient'],
|
install_requires=['setuptools'],
|
||||||
)
|
)
|
||||||
|
|
|
@ -30,6 +30,7 @@ import sys
|
||||||
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
VENV = os.path.join(ROOT, '.venv')
|
VENV = os.path.join(ROOT, '.venv')
|
||||||
PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
|
PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
|
||||||
|
TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
|
||||||
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
|
||||||
|
|
||||||
|
|
||||||
|
@ -100,7 +101,7 @@ def create_virtualenv(venv=VENV):
|
||||||
def install_dependencies(venv=VENV):
|
def install_dependencies(venv=VENV):
|
||||||
print 'Installing dependencies with pip (this can take a while)...'
|
print 'Installing dependencies with pip (this can take a while)...'
|
||||||
run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
|
run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
|
||||||
PIP_REQUIRES], redirect_output=False)
|
PIP_REQUIRES, '-r', TEST_REQUIRES], redirect_output=False)
|
||||||
|
|
||||||
|
|
||||||
def print_help():
|
def print_help():
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
pam==0.1.4
|
pam==0.1.4
|
||||||
WebOb==1.0.8
|
WebOb==1.0.8
|
||||||
eventlet
|
eventlet
|
||||||
|
greenlet
|
||||||
PasteDeploy
|
PasteDeploy
|
||||||
paste
|
paste
|
||||||
routes
|
routes
|
||||||
|
@ -9,26 +10,3 @@ sqlalchemy
|
||||||
sqlalchemy-migrate
|
sqlalchemy-migrate
|
||||||
passlib
|
passlib
|
||||||
lxml
|
lxml
|
||||||
|
|
||||||
# for python-novaclient
|
|
||||||
prettytable
|
|
||||||
|
|
||||||
# Optional backend: Memcache
|
|
||||||
python-memcached # increases performance of token validation calls
|
|
||||||
|
|
||||||
# Development
|
|
||||||
Sphinx>=1.1.2 # required to build documentation
|
|
||||||
coverage # computes code coverage percentages
|
|
||||||
|
|
||||||
# Testing
|
|
||||||
nose # for test discovery and console feedback
|
|
||||||
nosexcover
|
|
||||||
unittest2 # backport of unittest lib in python 2.7
|
|
||||||
webtest # test wsgi apps without starting an http server
|
|
||||||
pylint # static code analysis
|
|
||||||
pep8==0.6.1 # checks for PEP8 code style compliance
|
|
||||||
mox # mock object framework
|
|
||||||
|
|
||||||
-e git+https://review.openstack.org/p/openstack/python-keystoneclient.git#egg=python-keystoneclient
|
|
||||||
-e git+https://review.openstack.org/p/openstack-dev/openstack-nose.git#egg=openstack.nose_plugin
|
|
||||||
python-ldap==2.3.13# authenticate against an existing LDAP server
|
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
# keystonelight dependencies
|
|
||||||
pam==0.1.4
|
|
||||||
WebOb==1.0.8
|
|
||||||
eventlet
|
|
||||||
greenlet
|
|
||||||
PasteDeploy
|
|
||||||
paste
|
|
||||||
routes
|
|
||||||
sqlalchemy
|
|
||||||
sqlalchemy-migrate
|
|
||||||
passlib
|
|
||||||
python-memcached
|
|
||||||
lxml
|
|
||||||
|
|
||||||
# keystonelight testing dependencies
|
|
||||||
nose
|
|
||||||
nosexcover
|
|
||||||
|
|
||||||
# for python-keystoneclient
|
|
||||||
httplib2
|
|
||||||
pep8
|
|
||||||
-e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
|
|
||||||
|
|
||||||
# for python-novaclient
|
|
||||||
prettytable
|
|
||||||
|
|
||||||
# Optional backend: LDAP
|
|
||||||
python-ldap==2.3.13 # authenticate against an existing LDAP server
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
# 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
|
||||||
|
pylint # static code analysis
|
||||||
|
pep8==0.6.1 # checks for PEP8 code style compliance
|
||||||
|
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
|
||||||
|
|
||||||
|
# for python-keystoneclient
|
||||||
|
httplib2
|
||||||
|
-e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
|
||||||
|
|
||||||
|
# for python-novaclient
|
||||||
|
prettytable
|
5
tox.ini
5
tox.ini
|
@ -2,8 +2,9 @@
|
||||||
envlist = py26,py27,pep8
|
envlist = py26,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
deps = -r{toxinidir}/tools/pip-requires-test
|
deps = -r{toxinidir}/tools/pip-requires
|
||||||
commands = nosetests
|
-r{toxinidir}/tools/test-requires
|
||||||
|
commands = bash run_tests.sh -N --no-pep8
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
deps = pep8
|
deps = pep8
|
||||||
|
|
Loading…
Reference in New Issue