gentoo resync : 13.06.2020

5 files changed, 79 insertions, 4 deletions

diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index a607d5ae5437..0cb6b843cfa1 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,5 +1,8 @@
+AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
+DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9 SHA512 e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754
 EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
-EBUILD s3transfer-0.3.1.ebuild 938 BLAKE2B f3d9c3c9cb666e293bad93f1d61d97982503112c56577b29c06a8d3f3dd6fbdf5dc433180b6ee229a37864061693390610064aebe95de34eb4adc0a6c22cba2e SHA512 e57ea0aa7e8140c1a930a7ebdd728f6754244ebde8f21b56041cfe3d615e2bccd4e0ab39308bd542b807dae1759f50d7d5deed031a13d39d9f9d246f4983d43f
-MISC metadata.xml 377 BLAKE2B b67e151f23df1da87675bd70aa29b7793854028b49c2232a67e37272e1bfecacaa5fa58511af7b92ac9f9a0a4a2c991b3b62c0a5cbc88e01fc0ccc6a32a9583c SHA512 6f5b4c3fa2d4bce98c0177635b74eb1140b5bfdb0739d3b67bff431dc48e022dfa32dfa81c70bbe15080f5fca3c61fadc9c035d0aea9595ad9e125c7ea82c8a1
+EBUILD s3transfer-0.3.1.ebuild 922 BLAKE2B afa78438980a6bd51bd3bcc9966743185a46e9b4cf10614a6a57bc8fc6c6bffb3fadb37267ac5727b58391c31bb9f56a15157a07373278954270661884160791 SHA512 c49bd3aeb81dfbf12c14299e29a7b2afa8502592694b72a08fa712726b64d35739157aebc8e1b299a2222bb80a3eaf7f27719f538a6e051d650d3b31240eb5cc
+EBUILD s3transfer-0.3.3.ebuild 716 BLAKE2B 50de27aeab0e9251b793edaae04ed1e0cab3ef0c88f730b4e5b843b2e288f95c0149a645f20e7aa3fe2170e0fe8d71158322bfa4a3313d88911cf2d6952dab2c SHA512 11413cbab02052b563294a0f986cdbd72107273c379c00d215ed699a80536c5e0e7dda753812f75e89ed3fff866baf9c8d79e2ee40d5d399c3ba91ec49a5fae6
+MISC metadata.xml 478 BLAKE2B 8494fa51829bb778df3e7e93d1fccca86530c3577fe848f00b8f1c52dbfec8a56cbaaeedbdcd7db9eb5b542c8c2a73fbdceca9f46df3758b9f8636ee0fabedea SHA512 ba0e7c92da9cb77e61bfe7887fc97853f02379ebbffed62c08237bec954be080a64cc02e3d3e214b59c7a22e25c934fea3db5589c2f78462cce37186f63cea17
diff --git a/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch b/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
new file mode 100644
index 000000000000..89f3d4b5ab32
--- /dev/null
+++ b/dev-python/s3transfer/files/s3transfer-0.3.3-py38.patch
@@ -0,0 +1,32 @@
+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/metadata.xml b/dev-python/s3transfer/metadata.xml
index 2feb8f78c532..c2621bab9aca 100644
--- a/dev-python/s3transfer/metadata.xml
+++ b/dev-python/s3transfer/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/s3transfer</remote-id>
 		<remote-id type="pypi">s3transfer</remote-id>
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 412287de37c5..18df49217ff7 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/s3transfer/s3transfer-0.3.3.ebuild b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
new file mode 100644
index 000000000000..843a42f09de1
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+)
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}