dev-python/python-novaclient: bups and cleanups

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 92 insertions, 23 deletions

diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index a4353aad29e7..343e1091c922 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,4 @@
-DIST python-novaclient-3.3.2.tar.gz 271509 SHA256 6eba078c998d676f598925d9e6160f781e56f4b4d2afa0116c0134c326d5df49 SHA512 b2aa678aedad60e168b6adf5eb79ae403b1d6723ba1ff5c88bd51097b67bcbd5b1aac06f68f2040059b16bb39951399c1ced7033f8f6f9c271173b2d0ca921e5 WHIRLPOOL cf472691851340c69c1cd53987b4cfe3fe290ec64c14a939badcbe92ecddfcf06a68056badea5732d1a96b0aaad2fe828a02b34038f90c573f2dcf0dd23f9dea
 DIST python-novaclient-6.0.0.tar.gz 288335 SHA256 68fb4e75012a66d23198ca9c6cdc425cd9e0ce750bf759af6cd48fdb19ee6068 SHA512 b14a2ce3471e8853f9ccd67ed95779b8c9b9d6152eafb777c5b48c188f68a3046ff3886c02b76e1b04a4e9d7abf9bc6665f99ff6819fd9b0ee69fe4991dafde6 WHIRLPOOL b5e6853eb9147724879eceed8d08bacca6d2ecfca9527a49fb5fc4d0b31566bb9c9ca1597e4dfaf3dd6a15ce28ad145afc584f0cf0837c65cee17c38ea54cd5d
+DIST python-novaclient-6.0.1.tar.gz 288613 SHA256 2b7d4c660f46d8d7f4eb454fa9da4e8d838a81abc45834891c756393beeb264e SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7 WHIRLPOOL 5cce33c00730cf5e3c81a3c9e3207331161650340bf5b240bfbd687cdf5f2301c81be194b0e19d62e8660b9f4b3622dd241ce4fee511e83afb1769e6a101bb52
 DIST python-novaclient-7.1.0.tar.gz 282062 SHA256 fe69d9c95447381d563f0828359920730d38d5fa6f23af1215d4958479d1b9cb SHA512 4be552a69b8f33641aae1381ebdb0cd354f4d28c82cfe474cbcc7ed9def9a0537aee56a49cb33b48a341a7fab511eb2b3c0d9e5c718f70cd063fb0d553fb6325 WHIRLPOOL c2a8540151a978e6c9cd21d0acf675f0f6df87df5df177a615c1bc9038114f34355faf2238dc5c1b978160719b42daf0e9a1ef78b692abf4cd7cccc42e70af8f
+DIST python-novaclient-7.1.1.tar.gz 283129 SHA256 119a6f749cad3c752e7140beaacc64aa4ffd4b1e9913c8587d29b8abe918a29f SHA512 c8983cdcce3e506f5aa2288211b6b2fdded5bf65266a7740ed070aa26b27590f053cbd0a577fd34d71490deaf6ca4d3cfffb5e079289174312110ac602a06dbf WHIRLPOOL 0b2f5a02392b470b8f3816f9166331b6b198bdf16ec6a30b8481826229e63e861a9cc5ab3891d07f10546def6aa9b9e7cf57394d4dc3fa9e50deeeae687f1b60
diff --git a/dev-python/python-novaclient/python-novaclient-3.3.2.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
index 5b68ff12b106..cf48064b997d 100644
--- a/dev-python/python-novaclient/python-novaclient-3.3.2.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,56 +12,57 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
 		!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-		<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+		!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
 		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
-	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.1[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.2[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.3[${PYTHON_USEDEP}]"
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
 	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild
new file mode 100644
index 000000000000..d73a8c0cb9d7
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-7.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}