gentoo resync : 01.10.2021

7 files changed, 212 insertions, 16 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c1da8be07e8b..480c485ccdc9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,10 @@ DIST botocore-1.21.45.tar.gz 8170610 BLAKE2B e55cc819188ae61c1427a3a7e3ff008d85c
 DIST botocore-1.21.46.tar.gz 8175719 BLAKE2B 8c171e07e5c68b1d3721c0d5052b09d2c5522f0ed899453441e72c744e117f7479995ff2fde222c2c1fdcfe382464b9bc0898367a3d79b1e53dbfc60d855e10c SHA512 3ec64d160ec682d287fc1cadeb5ef4ed50a3157f98cd18514d75ec9e60ea73b4dde5a419e7a07c490216d8d67c29d214b88ff9fa1ef3a8b0bf176f11fb9cfcab
 DIST botocore-1.21.47.tar.gz 8183951 BLAKE2B 930fdccd5d45fb1fb88fec2370e65bff5eb7241ea3a666f1f0bfeb11ee3e1e5bb715d658ac1f340c0565f16bbba48fa57c7460aef0e0595486303f62f79df244 SHA512 705fa363bdd4663f774e349e448666d7bfd47c77b57689d6cc12039419c8a4f820d7edd01de9689cd56fee3d59138ea9bd803b4402c8b5fac95cd2de76fb1558
 DIST botocore-1.21.48.tar.gz 8180642 BLAKE2B 9efa407e69caebd7a8c8f058c356b024ac5f7ad1675c099bef1f593b391aab5901853e4c0b0a9989ac190bdbc8e869a2f0dd2670ce483f14f1f2b993971c4652 SHA512 1319679897ec3ed07a489a52d0d3e6a9abc529bb1c1aa458f1b51d1035d7e8bc203ba830fef2354fd07f058b3bb4ba140af34cb1616b509ecda08f5a18b2ed49
+DIST botocore-1.21.49.tar.gz 8202118 BLAKE2B cdda23ddbd1d9540c8dc1e53763bfccf9984a8df65683f1bb9e7541beca866beba75fd76a983c14c953224cdc19749b0e0af7e17529b4bd41869b5a2bfa49d0a SHA512 4a85a0bef518b57942b57fe01b10c588c3cceb1d8c7fa14e4bdc2e0c53fd3bf5b19947659870ce4af57bdabc4036d9a8c15b53530b7ec312e33b5bb91a784781
+DIST botocore-1.21.50.tar.gz 8204209 BLAKE2B a2db3a93696d6be68268265a7dbd1809edcaf9a3039974d55d718a86a3f9c8a08342f54ec9a491cdb0d32b6bb5505bc17e21d43fa8be2a93b34cc8305fb06b55 SHA512 b487a0463159d6e9109f8d195a567c0c086f705406b52554f2f18ccd57aff6e116e9176716a79f5d24066a43a8193ec088fdd4671df69d6c23102537b59c4f7d
+DIST botocore-1.21.51.tar.gz 8204164 BLAKE2B cf9a74b509ee721d19dc3c2f3e6c1ed5f571ea35ab813402d13d285c5f465f8146b1fe3ca99b863e4eb48574034ccadca6dfd0cc118f267ea917d4822f1bfa73 SHA512 4835bfcceb14a46315afdd74ee8015d51c951c4dd8e8b49fbbd9c02bbfd2958925b52661a65a9a26be6c386e2d251bea4322a8f9c3749d4815f2efdb97e403f8
+DIST botocore-1.21.52.tar.gz 8219147 BLAKE2B 2f60387b57cae96f288d08f71a68c6135c3e13008a31f4e9fd7dc19b9a98a90b20de92d7b3aa2e0a793524cf3944b5a707202e201214eb3fd84a8da47486473e SHA512 9b773e6852ab2b5f7f96383b6dc2d0d7d85d45d2124cc896e216cea576f82be8a642bdc8664b3478901dc154898211b9a3ef5cc0501cdf0f9cc75a6eb170cba7
 EBUILD botocore-1.21.28.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.21.40.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.41.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
@@ -19,5 +23,9 @@ EBUILD botocore-1.21.45.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a
 EBUILD botocore-1.21.46.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
 EBUILD botocore-1.21.47.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
 EBUILD botocore-1.21.48.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
-EBUILD botocore-9999.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
-MISC metadata.xml 612 BLAKE2B d63e3fc062deebe8e730b008f42f98fe05a6fcc8bc5631498b9c51838f922bd2b955490a65dd48ad969325583c661f6dc970cccc7a727aedacbc79ca213f7f63 SHA512 b8697f2375bb8bfe4dbe1cca24d2664a41a84dcf346e83c70471c53f1a57a1363babb75436a327cfb081269a4d519078a6f48940f21152ee1641481bd382081f
+EBUILD botocore-1.21.49.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.50.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.51.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.52.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.21.49.ebuild b/dev-python/botocore/botocore-1.21.49.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.49.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.50.ebuild b/dev-python/botocore/botocore-1.21.50.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.50.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.51.ebuild b/dev-python/botocore/botocore-1.21.51.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.51.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.21.52.ebuild b/dev-python/botocore/botocore-1.21.52.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.52.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index cb37cb422ac5..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -37,22 +37,14 @@ PATCHES=(
 
 distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 src_prepare() {
 	# unpin deps
 	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
 	distutils-r1_src_prepare
 }
 
 python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
+	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index 4c77da0dff8a..ab45dc6dcc4a 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -5,10 +5,6 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>