[gentoo-commits] repo/gentoo:master commit in: dev-python/s3transfer/

[Michał Górny]

commit:     daeae28f2b2f37634cf751815305aed137739aa0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 09:48:25 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 10:20:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daeae28f

dev-python/s3transfer: Fix for unbundled six from botocore

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

 .../{s3transfer-0.5.0.ebuild => s3transfer-0.5.0-r1.ebuild}   |  2 +-
 .../{s3transfer-0.5.0.ebuild => s3transfer-0.5.0-r2.ebuild}   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev-python/s3transfer/s3transfer-0.5.0.ebuild 
b/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
similarity index 92%
copy from dev-python/s3transfer/s3transfer-0.5.0.ebuild
copy to dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
index dd99b39e54a..5f47c8971c7 100644
--- a/dev-python/s3transfer/s3transfer-0.5.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-       dev-python/botocore[${PYTHON_USEDEP}]
+       <dev-python/botocore-1.23[${PYTHON_USEDEP}]
 "
 BDEPEND="
        test? (

diff --git a/dev-python/s3transfer/s3transfer-0.5.0.ebuild 
b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
similarity index 62%
rename from dev-python/s3transfer/s3transfer-0.5.0.ebuild
rename to dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
index dd99b39e54a..2092d5f3897 100644
--- a/dev-python/s3transfer/s3transfer-0.5.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
        dev-python/botocore[${PYTHON_USEDEP}]
@@ -25,6 +25,15 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+       # do not rely on bundled deps in botocore (sic!)
+       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() {
        epytest tests/{unit,functional}
 }