gentoo auto-resync : 27:09:2023 - 11:30:42

3 files changed, 73 insertions, 7 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 6775b4166bf7..ab2b56cfa706 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,10 @@
 DIST botocore-1.31.49.gh.tar.gz 11946203 BLAKE2B 3b3026f0861705cc3467391c673d2e2f8e63af1a2e52b63cad21e5f75bf31f5970a2a5f5a959dc8dcd1be6c3ad67ed10642c79a7d41a24e15e983096818e8197 SHA512 8e1cb12ff7455bbf62c5cf54c2bc1b8f48484ebc6e95b4e061d5bc6388a4ecd3ff4152a1d9aab5cbee84d872d59417cfb1cecb6fd281f1f8dd9e3e7e04cc782d
 DIST botocore-1.31.53.gh.tar.gz 11950545 BLAKE2B 2fef49b98179046203470c6dc145b13a1ff4ddec4eb3ac0bc8f9668b4d7ef9dfdee096f91abb8ede1e1abfffe55f72c9c38c63587b79082a2de7de84e4c9f273 SHA512 2c4d9761ee3cc8b73e60de3388475c64cbd562efd8265a098ba49731751d2c501167d84b010984a0dd738bb1e71a85db6f86aea68c86e9db5ed8613304570529
 DIST botocore-1.31.54.gh.tar.gz 11879790 BLAKE2B 8feaab92edaada974af275c81a41d6b36d6444ee1d46718b6c765aacad0450a52bf47fbcccd923f2c442400bea6cc1fb0f2fb8f6a73e3835fd16da38dc609ec4 SHA512 3dfa2212edbc9ed4bc435ec1d4f7aa8b9b9c656cd76feab6c898f57303897ee018120a069bc477fb8700111908ecaf6465229d67e6b6c5c777369b224d00c01d
+DIST botocore-1.31.55.gh.tar.gz 11883762 BLAKE2B eac01a2c463754306f2846ed914453114044b8ef0e94848d2bf0f59e01324bf8c7c366976722de7a791f482e891f005dc2f6ac4a1f3adfad92100d452b6bb3db SHA512 14bc1a6b12fd2bf08fa881f2265d1b0057c16b5001991278f07590f8f09b3237cf182a583f93a657d74c420179f0eee689debd192c254787aa8cb3fc17c79348
 EBUILD botocore-1.31.49.ebuild 1592 BLAKE2B c5a131514206b9f7ef98aaed462ec767d932eeea538773e42ca99947021c1041dbffcd6e2f46d892031cc069e60a9a0ca607d9550ac1c5aeed89d1054e00a1b2 SHA512 056d3df23d41a7a44604241a9cad27b7052f065f5e4cf9fc335cc0228ff6e27cdc744cc9e1a33f5b77414dc598467ac436588e6f1e1375464b8ea5961dbec73f
 EBUILD botocore-1.31.53.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.54.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
-EBUILD botocore-9999.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
+EBUILD botocore-1.31.55.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
+EBUILD botocore-9999.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.55.ebuild b/dev-python/botocore/botocore-1.31.55.ebuild
new file mode 100644
index 000000000000..7cacb5c3f634
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.55.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 5894fd995097..7cacb5c3f634 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -61,12 +61,8 @@ python_test() {
 		# rely on bundled six
 		tests/functional/test_six_imports.py::test_no_bare_six_imports
 		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
 	)
 
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
 }