| 1 |
commit: 8c41961cc0bb3a5ca8bd4774bee615885de0facd |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 13 18:21:42 2015 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 13 18:26:38 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c41961c |
| 7 |
|
| 8 |
sys-cluster/cinder: updating 2015.1.9999 deps |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
sys-cluster/cinder/cinder-2015.1.9999.ebuild | 12 +++++++++--- |
| 13 |
1 file changed, 9 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-cluster/cinder/cinder-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild |
| 16 |
index 10f2360..422f54e 100644 |
| 17 |
--- a/sys-cluster/cinder/cinder-2015.1.9999.ebuild |
| 18 |
+++ b/sys-cluster/cinder/cinder-2015.1.9999.ebuild |
| 19 |
@@ -25,8 +25,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
| 20 |
app-admin/sudo |
| 21 |
test? ( |
| 22 |
${RDEPEND} |
| 23 |
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}] |
| 24 |
- <dev-python/hacking-0.11[${PYTHON_USEDEP}] |
| 25 |
>=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
| 26 |
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] |
| 27 |
<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}] |
| 28 |
@@ -64,7 +62,7 @@ RDEPEND=" |
| 29 |
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] |
| 30 |
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}] |
| 31 |
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}] |
| 32 |
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}] |
| 33 |
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}] |
| 34 |
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}] |
| 35 |
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] |
| 36 |
<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}] |
| 37 |
@@ -81,6 +79,7 @@ RDEPEND=" |
| 38 |
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] |
| 39 |
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}] |
| 40 |
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}] |
| 41 |
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}] |
| 42 |
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}] |
| 43 |
>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}] |
| 44 |
>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}] |
| 45 |
@@ -119,6 +118,8 @@ RDEPEND=" |
| 46 |
<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] |
| 47 |
) |
| 48 |
>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}] |
| 49 |
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}] |
| 50 |
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}] |
| 51 |
>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}] |
| 52 |
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}] |
| 53 |
>=dev-python/suds-0.4[${PYTHON_USEDEP}] |
| 54 |
@@ -153,6 +154,11 @@ pkg_setup() { |
| 55 |
enewuser cinder -1 -1 /var/lib/cinder cinder |
| 56 |
} |
| 57 |
|
| 58 |
+python_prepare_all() { |
| 59 |
+ sed -i '/^hacking/d' test-requirements.txt || die |
| 60 |
+ distutils-r1_python_prepare_all |
| 61 |
+} |
| 62 |
+ |
| 63 |
python_compile() { |
| 64 |
distutils-r1_python_compile |
| 65 |
mv cinder/test.py cinder/test.py.bak || die |
Archives