gentoo resync : 28.04.2021

6 files changed, 41 insertions, 48 deletions

diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index c1d2922b43de..e4c0b84fad64 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,8 +1,9 @@
-AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
-DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
-DIST s3transfer-0.3.5.tar.gz 118959 BLAKE2B 8666ec91058752a1862582f886d373bd4eebbb3684571e1fcb0648e2c4ef3f24366b4e496960715487b6f1fb7fdc96f0031ee48259984f2bcdfbb2a8fe3d33bb SHA512 2a5a0b3163a8ae7097d82f897afec97533acc0d1a03271b5e261bc0b98a9af5a0fa0d594cc4cb701c1698bbc347d10b2b105c4393f349bfd5ef628d1844e7ddb
 DIST s3transfer-0.3.6.tar.gz 118877 BLAKE2B 0567b69ee71bd470b3b5bccce3db3e923eee6d8744d9e0e5a1789f3ba5f419742859f530ab43295e5ccb7ffe3c04da8db7ef92c973afac97ff2580bc13c6934f SHA512 3bf97f080b63a88f2860051ef9c0ecd4f06adf1a22eb5bd57c543532f7e85c39f722f0c9cd24022ac0ed3a54ca48a089a10b86703cb866730e265e53acbe602f
-EBUILD s3transfer-0.3.4.ebuild 731 BLAKE2B b81ae9a3411f6f4e5633da1fef1b34108e01c4c34dfaaf0d55bfc318984fcb670dc7414acde89b4789f37bd34c370f89832d3ae30a84d33a91a348b422860961 SHA512 19232c442fc89e2c7272255507cb9c21f23eb4cd3c04848798a799f9b089934b8dec296120ce6b211fd686ae1a9ae3c00f5573ec932c21d5828ab2312474c7bc
-EBUILD s3transfer-0.3.5.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
-EBUILD s3transfer-0.3.6.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
+DIST s3transfer-0.3.7.tar.gz 120311 BLAKE2B a5de6ce10527495843605ea9e887ccbfead86f32d0eaa2f68dcc21dceb35c86cc21690bd82e3edd5a033699cf4257db93588cf7bbea8f75c01a80c29a17397fb SHA512 b341103e87c092b1c016dc8bfc45b4564c54f5c5a1f3549cf421802620b755d0779b80718a5b4357d3b206b71773fb2b28571730b673fd9af27fc8a3a40ce1b4
+DIST s3transfer-0.4.1.tar.gz 129580 BLAKE2B 5b700fc9b7222b32ea74fa0f2ff59754412e4a65eda028433659861538160cb016e3f97421e237b8050920eaf2609fb0756ffc568331c15b1eb313976df30aac SHA512 1de0569d99bf32b5a3a2c240755d82050f4bf72fd98449e19c2807d21180415edff77b86bfc47d0e8c4952a066c933589862cc08851a7b87b1521e4af7da27f9
+DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
+EBUILD s3transfer-0.3.6.ebuild 627 BLAKE2B 0af227d2ef3bf1ee7649d3c2728416b075bdf7389b7db9529ae1b9b2c7eb476e19723899fd6b1bf9db7fdf1754dfb32e344e738d09c1e2392edbc675dbfaefe3 SHA512 a3613f6fdaf014f10901106b3e456374df7bb6d355855f3f45439934c0d0e88b9e9f51e8b4ebecf6df3ed8cd466bedbedf9b9c13d57af882251948cb6480b34c
+EBUILD s3transfer-0.3.7.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
+EBUILD s3transfer-0.4.1.ebuild 595 BLAKE2B 7060cc40b793050bc7afa6057b08361db761de53ba5bc66dafd623a6ba218042b06c2933a58606c1aefc76a8c6a2d26175f86876fd5d6b8a01955748b4b8a45a SHA512 a9f7f36796ca1009c0d2178a0fa3e9060b28f11c57124d215c3aaf33c9812092c00eb0465d5e78b40e77f801c7258634a266ba3bba37188dab1da6c54fe406ea
+EBUILD s3transfer-0.4.2.ebuild 595 BLAKE2B 7060cc40b793050bc7afa6057b08361db761de53ba5bc66dafd623a6ba218042b06c2933a58606c1aefc76a8c6a2d26175f86876fd5d6b8a01955748b4b8a45a SHA512 a9f7f36796ca1009c0d2178a0fa3e9060b28f11c57124d215c3aaf33c9812092c00eb0465d5e78b40e77f801c7258634a266ba3bba37188dab1da6c54fe406ea
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch b/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
deleted file mode 100644
index 89f3d4b5ab32..000000000000
--- a/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f211b9851698d07cf218e78ebb39a337c8751df8 Mon Sep 17 00:00:00 2001
-From: Christopher Baines <mail@cbaines.net>
-Date: Sat, 2 May 2020 15:19:58 +0100
-Subject: [PATCH] Fix test_download_futures_fail_triggers_shutdown with Python
- 3.8
-
-The behaviour of set_exception for futures changed in Python 3.8, it'll now
-raise concurrent.futures.InvalidStateError if the future is already done [1],
-which is the case in this test because set_result has already been called on
-the future.
-
-1: https://bugs.python.org/issue33238
-
-Fix the test by not using the future from SequentialExecutor, and instead
-creating a future which doesn't have a result.
----
- tests/unit/test_s3transfer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/test_s3transfer.py b/tests/unit/test_s3transfer.py
-index a87b4dd..4715be2 100644
---- a/tests/unit/test_s3transfer.py
-+++ b/tests/unit/test_s3transfer.py
-@@ -465,7 +465,7 @@ def __init__(self, max_workers):
-                 self.is_first = True
- 
-             def submit(self, function):
--                future = super(FailedDownloadParts, self).submit(function)
-+                future = futures.Future()
-                 if self.is_first:
-                     # This is the download_parts_thread.
-                     future.set_exception(
diff --git a/dev-python/s3transfer/s3transfer-0.3.6.ebuild b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
index 48ca166b1782..cffe8ad9dabb 100644
--- a/dev-python/s3transfer/s3transfer-0.3.6.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/s3transfer-0.3.5.ebuild b/dev-python/s3transfer/s3transfer-0.3.7.ebuild
index 48ca166b1782..48ca166b1782 100644
--- a/dev-python/s3transfer/s3transfer-0.3.5.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.7.ebuild
diff --git a/dev-python/s3transfer/s3transfer-0.3.4.ebuild b/dev-python/s3transfer/s3transfer-0.4.1.ebuild
index 66e3530ca124..f64a2ccad3b5 100644
--- a/dev-python/s3transfer/s3transfer-0.3.4.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.4.1.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
@@ -14,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
@@ -25,12 +23,8 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/s3transfer-0.3.3-py38.patch
-)
+distutils_enable_tests pytest
 
 python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+	epytest tests/{unit,functional}
 }
diff --git a/dev-python/s3transfer/s3transfer-0.4.2.ebuild b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
new file mode 100644
index 000000000000..f64a2ccad3b5
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}