From: Matthew Thode <mthode@mthode.org>
Date: Thu, 3 Sep 2015 16:43:50 +0000 (-0500)
Subject: dev-python/python-heatclient: bup for liberty
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e2dbedfc36253a1e7ee40f53ed42c1d3923397e;p=gentoo.git

dev-python/python-heatclient: bup for liberty

Package-Manager: portage-2.2.20.1
---

diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 46f3413d967a..ea5f5fd81c5c 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,6 +1,4 @@
-DIST python-heatclient-0.2.12.tar.gz 99919 SHA256 e9d5b74206b322ce30184a1b132a78b8be1806be85c77361fb72a966c4c48afe SHA512 49d28e63bf9e7c227443cf58c6870900f2fb23d6f4e0457b97cfdf615af01b95c046759c4d763e8c9ab702f5a85fe79925aa19d905bbb2c4e94eea48e4ca066e WHIRLPOOL 712aacc7dae4114cd61e02ab22ff50a61b85ddde35cfcfa26fbe02c46ae63808e0c95a13beb5cec9724e3b0fd3b68970123dc679d6cfb765aa0ec57d5d430c82
-DIST python-heatclient-0.2.9.tar.gz 81470 SHA256 8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f SHA512 05fc3a5ff8e738fdc3ac2c5d8221c9be932467aa9109e1138c4a96053f7e68d8ba77b13f50968f05a37e94b60bd5ff2e798faf0c5b145ae80c2a0a6f7f68313a WHIRLPOOL 1c77ac1329c6f5dc1c207670d5864ea44046d6a0686b12c373ad2a26560999fc0bdc011b8efaf431f9c6f5379d19eb9bb65b68fb08a7297f12ec6e0313ce1846
-DIST python-heatclient-0.3.0.tar.gz 95621 SHA256 c3fe26b69610dcd1540f5ab2c8ae59183c3df09d9ede52a5bb704977345f29ad SHA512 f550e785ce21e1a1ad8dedfb1fc94bdaf4e0d9b5902c05a704b73c72e3e49ac6e35f79acbbc8ac511bca329d5032f796447899dfa737da0f7b8b376e5983153a WHIRLPOOL 9a02d508401600a659f552d2c7b46d7a4c94500514ff3763bd47ecfefa2fcc89cf49b20bbfbdb859a04fe4c719bcbdceb29d15cc793f631c89192a03642a2b3f
 DIST python-heatclient-0.4.0.tar.gz 104613 SHA256 1b71e2bb5c380ac6b2e1f07b48b7b3e82e7364cc43255ed696c795ab5f8d5a1d SHA512 f1235e40d6407fc05f53dfa1592d4f1fa72c10c6aa17fcbb78a7a8bf999cf803f4a42f9f7672f403d336006bdb72f3960d849474c398e592085f1d637a28faed WHIRLPOOL 680af36f92f9674667cf1ad97167248e3b30b4fc828065bd9f2dd7ecef4fd7dcd03729c5d257d8f31ce42184764bcea1d4c4aaee37d53ac63e1e44183c694f84
 DIST python-heatclient-0.5.0.tar.gz 104320 SHA256 b64eadecea1ecab5b69c1f51ddd157d53d218dea1360c201843f28a052cb3dbf SHA512 97ac1bb3ef1ca82730650e42dffa5dec2f1f37fac63c38a8c2de87b2ccf772b905749f4e9211831ec92871ebaee57a5094a4a1005e7391823a6dee27b0592dd8 WHIRLPOOL fc90b7a21d70c9044cdb39d626584192dcc347f531f0dc83b5b349d8731b7e3e0278586f5dcec32d9be10d02a6a6cb53175c6088fc43857b9b874a979da77de2
 DIST python-heatclient-0.6.0.tar.gz 109553 SHA256 fe293e11d145d86b92649063eb50d1f599dab88a327707d76a72b12022b77bbb SHA512 04b8836c212a8825b6ffb839715df881189a08e3c587762a661744bdd730d6aaf99c9e3497642011b0696692c856e12131bc8d1ff6a69cb88ae5b48aa3872b39 WHIRLPOOL 683497a0363ce636499af5866838242ef1fc2769c54d5ddf32e8dcfd5d0d2f3b648d46c0bb59c14bf1043875bf65ec99b090add1a289c9c95d383ce5ba918e3f
+DIST python-heatclient-0.7.0.tar.gz 119131 SHA256 6f58a3c759056dbcbf071e1707d6649e6d15cfc710daa1b98e9703b83a4a01c2 SHA512 5c9f12b08abaa9ff07a0dd72ceef7b205ae2afeb4d8900b2e1c3f709fc6df63f56f9d31b45acc17cfb51a1ec849bd3cd271877d9489c40d665488346531c97f0 WHIRLPOOL 0c911dca2dd48229c83ff83bcfa699d07e0ea39b3bbfff5bd3e3e7fbe62fa747ade252bb7ad320334c4bc9fd481c2c528058368d8828e56c20c0254105559035
diff --git a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild b/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
deleted file mode 100644
index 92123614f5e3..000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_IN_SOURCE_BUILD=TRUE  # Needed due to versioned test patches
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# NOTE: doc is broken due to pbr requiring a git checkout
-
-# NOTE: dev-python/discover is not used in tests
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.0[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.1[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.2[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-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/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_test() {
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
-	ebegin 'patching heatclient/tests/test_common_http.py'
-	sed \
-		-e '651,/def/ d' \
-		-i heatclient/tests/test_common_http.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
-	ebegin 'patching heatclient/tests/test_shell.py'
-	sed \
-		-e '1953,/def|@/ d' \
-		-i heatclient/tests/test_shell.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	if [[ "${EPYTHON}" = "python3.3" ]]; then
-		# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375047
-		ebegin 'patching heatclient/tests/test_events.py'
-		sed \
-			-e '68,/def/ d' \
-			-i heatclient/tests/test_events.py
-		STATUS=$?
-		eend ${STATUS}
-		[[ ${STATUS} -gt 0 ]] && die
-
-		# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375049
-		ebegin 'patching heatclient/tests/test_events.py'
-		sed \
-			-e '111,/def/ d' \
-			-e '53,/def/ d' \
-			-i heatclient/tests/test_events.py
-		STATUS=$?
-		eend ${STATUS}
-		[[ ${STATUS} -gt 0 ]] && die
-
-		ebegin 'patching heatclient/tests/test_resources.py'
-		sed \
-			-e '69,/def/ d' \
-			-i heatclient/tests/test_resources.py
-		STATUS=$?
-		eend ${STATUS}
-		[[ ${STATUS} -gt 0 ]] && die
-
-		# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375051
-		ebegin 'patching heatclient/tests/test_template_utils.py'
-		sed \
-			-e '231,/def/ d' \
-			-i heatclient/tests/test_template_utils.py
-		STATUS=$?
-		eend ${STATUS}
-		[[ ${STATUS} -gt 0 ]] && die
-	fi
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-heatclient/python-heatclient-0.2.9.ebuild b/dev-python/python-heatclient/python-heatclient-0.2.9.ebuild
deleted file mode 100644
index d50d83f4cd12..000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-RESTRICT="test"
-
-DESCRIPTION="This is a client library for Heat built on the Heat orchestration
-API."
-HOMEPAGE="https://github.com/openstack/python-heatclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	"${PYTHON}" setup.py testr --coverage
-	"${PYTHON}" setup.py testr --slowest
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-heatclient/python-heatclient-0.3.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
similarity index 64%
rename from dev-python/python-heatclient/python-heatclient-0.3.0.ebuild
rename to dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
index 62982fb639b9..12ac0613605e 100644
--- a/dev-python/python-heatclient/python-heatclient-0.3.0.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1
 
@@ -17,28 +17,26 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 	)
 	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.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}]
@@ -49,18 +47,24 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
 
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }