dev-python/botocore: Bump to 1.25.0

Signed-off-by: Michał Górny <mgorny@gentoo.org>

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d3476011d137..71de0c92b478 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,3 +12,4 @@ DIST botocore-1.24.43.tar.gz 8913464 BLAKE2B b974ba0a5cc7c1176acab80baf329a11a78
 DIST botocore-1.24.44.tar.gz 8915208 BLAKE2B eecbe7089e2aab77a90cedb87f729e1bd2f2074ec8218d3ebad314ab884806703d8a907c448e35586bafcc71fae0d0991e8656fdc1f937cc18bb503b4a807f93 SHA512 3850ea97e93b6cba211bd42e75ea1499ae09ea9c2acc576c229ca8ae4786779e2ff6ea283443d0d9fc6e856174cbf1bc402cbf87e946ce57f67569b448caf56a
 DIST botocore-1.24.45.tar.gz 8920603 BLAKE2B a71ba9d90edbbdc278890241cfce72753e5d3662298cb7a09e4314da1fa4af8fe33629c10160549b0d0832aef859b5bfeb449c3b559daad531d4e1e23afd2c43 SHA512 e7756bf7913bf5dce81d089674e2375ae5447c434b5ecc29c8b5b824d6cb19fe7f03e81cde46703a43356e5e8e2f45793ad521d0c0c7f3d29a810f01be50b087
 DIST botocore-1.24.46.tar.gz 8922345 BLAKE2B f9caf235e902be9e4e15e9a570e67cac328eb7e53668e7e12ba8e6caa4c9ed53e22115231d58fdf8d782ff3ab618e5485438dce7c454918a5d53341e5e5967ac SHA512 ccdbd6e6617a68f810c5491f37a6e94ffe015b30dfea8b01c2543b58c81573358b69af702df2fcf3efb7dd2c4b715e86957c4d60b8f0a0a51279e921dfe02993
+DIST botocore-1.25.0.tar.gz 8925642 BLAKE2B 7f7b89e59801564284cd5e22958bb590aeb821c38682c7dd6163fd31b1c181ae67412b3d8cde351a48a63c2e762923d6bb2bb051e9a367468eb77db228e1c3ad SHA512 43f3edcd6868b37933b24486091097dd6dfc51f51773bea3e3cff1fce5eef5f8b3df6d09b8815c858f5c8d7e87e8ed14cf13f236e72c851e4f98d52ad85e4afc
diff --git a/dev-python/botocore/botocore-1.25.0.ebuild b/dev-python/botocore/botocore-1.25.0.ebuild
new file mode 100644
index 000000000000..759ccf657074
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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="mirror://pypi/${PN:0:1}/${PN}/${P}.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}]
+	)
+"
+
+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
+
+	# 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
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 35239170e3a4..759ccf657074 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -22,7 +26,7 @@ fi
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "