summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/keystone')
-rw-r--r--sys-auth/keystone/keystone-2015.1.9999.ebuild8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys-auth/keystone/keystone-2015.1.9999.ebuild b/sys-auth/keystone/keystone-2015.1.9999.ebuild
index a3ab5b1aef2d..c03895ef3ec7 100644
--- a/sys-auth/keystone/keystone-2015.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2015.1.9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="
<dev-python/pbr-1.0[${PYTHON_USEDEP}]
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
dev-lang/python[sqlite]
memcached? (
@@ -88,13 +86,15 @@ RDEPEND="
<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
)
>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -113,6 +113,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
dev-python/pysaml2[${PYTHON_USEDEP}]
@@ -134,6 +135,7 @@ pkg_setup() {
python_prepare_all() {
# it's in git, but not in the tarball.....
+ sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
mkdir -p ${PN}/tests/tmp/ || die
cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
distutils-r1_python_prepare_all