Update requirements by hand.
This folds the py3 versions (which infra were not linting until recently) into the requirements files they should now use. Note that the -e line for ldap wasn't meant to ever merge, and I'm not sure it can be merged now, so I've dropped it and we'll see what happens on test. Change-Id: Idbd162d70620f683d1bc664193b2a5fe64c159b9
This commit is contained in:
Robert Collins
parent
b04158cd24
commit
7efc3df630
@ -1,36 +0,0 @@
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
pbr<2.0,>=0.11
|
||||
WebOb>=1.2.3
|
||||
eventlet>=0.17.4
|
||||
greenlet>=0.3.2
|
||||
PasteDeploy>=1.5.0
|
||||
Paste
|
||||
Routes!=2.0,>=1.12.3
|
||||
cryptography>=0.8.2 # Apache-2.0
|
||||
six>=1.9.0
|
||||
SQLAlchemy<1.1.0,>=0.9.7
|
||||
sqlalchemy-migrate>=0.9.6
|
||||
passlib
|
||||
python-keystoneclient>=1.6.0
|
||||
keystonemiddleware>=1.5.0
|
||||
oslo.concurrency>=2.1.0 # Apache-2.0
|
||||
oslo.config>=1.11.0 # Apache-2.0
|
||||
# oslo.messaging tries to pull in eventlet
|
||||
# oslo.messaging>=1.6.0 # Apache-2.0
|
||||
oslo.db>=1.10.0 # Apache-2.0
|
||||
oslo.i18n>=1.5.0 # Apache-2.0
|
||||
oslo.log>=1.2.0 # Apache-2.0
|
||||
oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
|
||||
oslo.policy>=0.5.0 # Apache-2.0
|
||||
oslo.serialization>=1.4.0 # Apache-2.0
|
||||
oslo.service>=0.1.0 # Apache-2.0
|
||||
oslo.utils>=1.6.0 # Apache-2.0
|
||||
oauthlib>=0.6
|
||||
pysaml2>=2.4.0
|
||||
dogpile.cache>=0.5.3
|
||||
jsonschema!=2.5.0,<3.0.0,>=2.0.0
|
||||
pycadf>=0.8.0
|
||||
msgpack-python>=0.4.0
|
||||
@ -8,7 +8,7 @@ eventlet>=0.17.4
|
||||
greenlet>=0.3.2
|
||||
PasteDeploy>=1.5.0
|
||||
Paste
|
||||
Routes!=2.0,>=1.12.3
|
||||
Routes!=2.0,!=2.1,>=1.12.3
|
||||
cryptography>=0.8.2 # Apache-2.0
|
||||
six>=1.9.0
|
||||
SQLAlchemy<1.1.0,>=0.9.7
|
||||
@ -20,7 +20,7 @@ keystonemiddleware>=1.5.0
|
||||
oslo.concurrency>=2.1.0 # Apache-2.0
|
||||
oslo.config>=1.11.0 # Apache-2.0
|
||||
oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
|
||||
oslo.db>=1.10.0 # Apache-2.0
|
||||
oslo.db>=1.12.0 # Apache-2.0
|
||||
oslo.i18n>=1.5.0 # Apache-2.0
|
||||
oslo.log>=1.2.0 # Apache-2.0
|
||||
oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
hacking<0.11,>=0.10.0
|
||||
bashate>=0.2 # Apache-2.0
|
||||
|
||||
# pysqlite does not install on py3
|
||||
# Optional backend: SQL
|
||||
# pysqlite
|
||||
|
||||
# python-memcached does not install on py3
|
||||
# Optional backend: Memcache
|
||||
# python-memcached>=1.48
|
||||
|
||||
# Optional dogpile backend: MongoDB
|
||||
pymongo>=3.0.2
|
||||
|
||||
# Optional backend: LDAP
|
||||
# python-ldap does not install on py3
|
||||
# authenticate against an existing LDAP server
|
||||
# python-ldap>=2.4
|
||||
# ldappool>=1.0 # MPL
|
||||
-e git+https://github.com/rbarrois/python-ldap.git@py3#egg=python-ldap
|
||||
|
||||
|
||||
# Testing
|
||||
# computes code coverage percentages
|
||||
coverage>=3.6
|
||||
# fixture stubbing
|
||||
fixtures>=0.3.14
|
||||
# xml parsing
|
||||
lxml>=2.3
|
||||
# mock object framework
|
||||
mock>=1.0
|
||||
oslotest>=1.5.1 # Apache-2.0
|
||||
# required to build documentation
|
||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||
# test wsgi apps without starting an http server
|
||||
WebTest>=2.0
|
||||
|
||||
# mox was removed in favor of mock. We should not re-enable this module. See
|
||||
# discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html
|
||||
#mox>=0.5.3
|
||||
|
||||
python-subunit>=0.0.18
|
||||
testrepository>=0.0.18
|
||||
testtools>=1.4.0
|
||||
|
||||
# For documentation
|
||||
oslosphinx>=2.5.0 # Apache-2.0
|
||||
|
||||
tempest-lib>=0.5.0
|
||||
|
||||
# Functional tests.
|
||||
python-keystoneclient>=1.6.0
|
||||
requests>=2.5.2
|
||||
@ -13,14 +13,14 @@ pymongo>=3.0.2
|
||||
|
||||
# Optional backend: LDAP
|
||||
# authenticate against an existing LDAP server
|
||||
python-ldap>=2.4
|
||||
python-ldap>=2.4;python_version=='2.7'
|
||||
ldappool>=1.0 # MPL
|
||||
|
||||
# Testing
|
||||
# computes code coverage percentages
|
||||
coverage>=3.6
|
||||
# fixture stubbing
|
||||
fixtures>=0.3.14
|
||||
fixtures>=1.3.1
|
||||
# xml parsing
|
||||
lxml>=2.3
|
||||
# mock object framework
|
||||
@ -42,7 +42,10 @@ testtools>=1.4.0
|
||||
# For documentation
|
||||
oslosphinx>=2.5.0 # Apache-2.0
|
||||
|
||||
tempest-lib>=0.5.0
|
||||
tempest-lib>=0.6.1
|
||||
|
||||
# Security checks
|
||||
bandit>=0.10.1
|
||||
|
||||
# Functional tests.
|
||||
requests>=2.5.2
|
||||
|
||||
8
tox.ini
8
tox.ini
@ -14,8 +14,7 @@ whitelist_externals = bash
|
||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||
|
||||
[testenv:py33]
|
||||
deps = -r{toxinidir}/requirements-py3.txt
|
||||
-r{toxinidir}/test-requirements-py3.txt
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
nose
|
||||
commands =
|
||||
nosetests --with-coverage --cover-package=keystone \
|
||||
@ -41,8 +40,7 @@ commands =
|
||||
keystone/tests/unit
|
||||
|
||||
[testenv:py34]
|
||||
deps = -r{toxinidir}/requirements-py3.txt
|
||||
-r{toxinidir}/test-requirements-py3.txt
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
nose
|
||||
commands =
|
||||
nosetests --with-coverage --cover-package=keystone \
|
||||
@ -91,7 +89,7 @@ commands = oslo_debug_helper {posargs}
|
||||
|
||||
[testenv:functional]
|
||||
basepython = python3.4
|
||||
deps = -r{toxinidir}/test-requirements-py3.txt
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
setenv = OS_TEST_PATH=./keystone/tests/functional
|
||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user