summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2015-10-13 13:23:58 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2015-10-13 13:26:52 -0500
commit6286aba91bb1395b79888fde7fb7ecfc55b3042d (patch)
treebeaec32186206ad5ab3cbc1b1e01181cbf9f82e8 /sys-cluster/nova
parentsys-cluster/neutron: updating 2015.1.9999 deps (diff)
downloadgentoo-6286aba91bb1395b79888fde7fb7ecfc55b3042d.tar.gz
gentoo-6286aba91bb1395b79888fde7fb7ecfc55b3042d.tar.bz2
gentoo-6286aba91bb1395b79888fde7fb7ecfc55b3042d.zip
sys-cluster/nova: updating 2015.1.9999 deps
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sys-cluster/nova')
-rw-r--r--sys-cluster/nova/nova-2015.1.9999.ebuild17
1 files changed, 10 insertions, 7 deletions
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 20dd5e439514..2ba0bf9daa34 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -27,14 +27,13 @@ DEPEND="
app-admin/sudo
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
dev-python/mysql-python[${PYTHON_USEDEP}]
dev-python/psycopg[${PYTHON_USEDEP}]
>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
@@ -94,7 +93,9 @@ RDEPEND="
>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
dev-python/paste[${PYTHON_USEDEP}]
- ~dev-python/sqlalchemy-migrate-0.9.5[${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/netaddr-0.7.12[${PYTHON_USEDEP}]
>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -104,7 +105,7 @@ RDEPEND="
<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
<dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
@@ -115,7 +116,7 @@ RDEPEND="
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
<dev-python/websockify-0.7.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}]
@@ -126,6 +127,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/oslo-db-1.7.0[${PYTHON_USEDEP}]
<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
@@ -180,9 +182,10 @@ pkg_setup() {
enewuser nova -1 -1 /var/lib/nova nova
}
-python_prepare() {
- distutils-r1_python_prepare
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+ distutils-r1_python_prepare_all
}
python_compile() {