gentoo resync : 15.12.2019

7 files changed, 226 insertions, 1 deletions

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 33fbb8128bce..018cc2b9d44a 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,4 +1,12 @@
 AUX twine-1.11.0-tests.patch 432 BLAKE2B f912ae6e51652c299d4b99f2db69f6daa309f0a04e89205fa207e6ed8073c84b212ac6c24a344850b5d11e9a55eb0e6924c0c3306517726c262df1c298114c2e SHA512 a997ca1f2d077a3a23374bc816cc4d6d295c8912a3a28fa6bc404891fe6699e88d98febcf8867e137906b4e5994ab73ea0899fd5045768f30f482d845b295f6d
+AUX twine-1.15.0-tests.patch 731 BLAKE2B 8720a98cbcc69f20096aa0e7e19be78c6ebb842b36c0c5f24bb60f1c2425e555e0b775c9f3cc1b3df7efafa8c7938cc5d85aff5f2ea364734459be7090f1ab6a SHA512 c8388f642045030bdd381c9fc6924ee12ce173f886559161a5941cf343912c2a649bd47e190b031c25d1d73266f3e5b5a9aa740f0315b129d91a4708e77c4446
+AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725db39dc5dd555b4f87b468110e72b6f899835cf1dc3a129762bf9d162cff98e7453814cf917562c401315df3e SHA512 a3ed4afa3c4b4137e953adba6fd8994f95fdd7b5dac67a57b8f75247a78c09f59699e37e43fe3d38e9440d3ba41dd0713f6bed539538e521cce5501a80ee6d81
 DIST twine-1.11.0.tar.gz 55301 BLAKE2B 88e88bc88a6dc8320064b3e296d85f1614d1ecf1628c8442737566ac58c3296b2292f147c0b39047a1d13a3ac98297fd7a77a0ba6fdb6ff04e59d16bc8ed463a SHA512 28e588f26b59bc9f4a8481caf2353934ad6927734762ffebb4416c147ec9e6dffb37092def20a76eb888c94b27f97e013dacc42c63e5dcda30f4290bb6c90a22
-EBUILD twine-1.11.0.ebuild 1153 BLAKE2B ef80a4f92f8ce241aa7c6d803d9fa146ffaac2e2743332580280506f106da47bbe1322e42818db3e8010a98b9049eca4346a24468d45a924c9f5c6f92d1e880b SHA512 9fa25d8318426e3406a61591cf55db1801702001613ac42b852cfe5981348af55eb85dd30e13d4e2494d69b2a0e206a9eff23ff55de22c969ae6075fce13d084
+DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
+DIST twine-3.0.0.tar.gz 138502 BLAKE2B 80cc475704979030435505103e45cfd051d2e3979e6fd9d4ad33fdbb2644bdebf789c504491f22a161f346295222287114ab68034560360f08a1beadefb20ac0 SHA512 1f5577c74c47618ae07672b53633110a5ecb486d25046cb87f36cbf5974b679714f962803b9dc6e970c57d8f2542b323e11437e76effe7172511557b56df5f12
+DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
+EBUILD twine-1.11.0.ebuild 1180 BLAKE2B 667e16f7b2f44a2ce42a1aaccf22741869b89d4733d0862eb38774d9719155ea794058d0b397f91edc944361f5094860c220e97893ff006980b7ca6640c9e905 SHA512 d73a7bd8a14364455974046438a44b0e83ce110b5c97d08483afa37882dae6263631b0b230528f493ac75404a05a699c0b52d0c268e8ee8786f3322724941219
+EBUILD twine-1.15.0.ebuild 1322 BLAKE2B 17fefac04daad1a0c03b292818d8c409afd77033af28b7f01adb89107d60f10b09732b98ddd7e82343141d7e692e2d0598821fc0d7922503fb83636917767d8d SHA512 f12bfca9375db7c8b82b6e2dfd21baf0ebcf5ba53f6439bee91c8d4d128e87e90a215b63127504c925e54068ba1f420f11139bf75b02be5776481cbd882bf38d
+EBUILD twine-3.0.0.ebuild 1757 BLAKE2B 783da90be51a5d9ef37493e137725b169df848e9271d368c39c52f34ac2f444bde7a81bac9cb9e2a0f7617426caf875baa60467e63567472f257ac59b65a1b20 SHA512 31c21078d3c7bac76ba3f6065953de708991890a401eef990835905cdc9fec9be56bef8eb9d2bfab22087d5731c89a342747a63d7e3142cb50b9a46d8754876b
+EBUILD twine-3.1.1.ebuild 1811 BLAKE2B 112908686d07e9cc9f4234cb33b7ce4725982310c290667c2bb942edf3c0fb1c191a93cd9efa5c483408a915b60fdc892d2491a3a08dc3a63c80b6a30b6a9463 SHA512 0e2a17da3847c03fff802cb11ff8475bd6330880f8bea480cef43e8bab3ad8d7d87c582e4866691dd6c00f389e72c50d9fd7e60b6aa47346020bd63310df9033
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/files/twine-1.15.0-tests.patch b/dev-python/twine/files/twine-1.15.0-tests.patch
new file mode 100644
index 000000000000..ce75469c091f
--- /dev/null
+++ b/dev-python/twine/files/twine-1.15.0-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/test_package.py b/tests/test_package.py
+index 8e4fbbb..35c9c52 100644
+--- a/tests/test_package.py
++++ b/tests/test_package.py
+@@ -214,11 +214,11 @@ TWINE_1_5_0_WHEEL_HEXDIGEST = package.Hexdigest(
+     'b657a4148d05bd0098c1d6d8cc4e14e766dbe93c3a5ab6723b969da27a87bac0',
+ )
+ 
+-if platform.python_implementation().lower() == 'pypy':
+-    # pyblake2 refuses to install on PyPy
+-    TWINE_1_5_0_WHEEL_HEXDIGEST = TWINE_1_5_0_WHEEL_HEXDIGEST._replace(
+-        blake2=None,
+-    )
++#if platform.python_implementation().lower() == 'pypy':
++#    # pyblake2 refuses to install on PyPy
++#    TWINE_1_5_0_WHEEL_HEXDIGEST = TWINE_1_5_0_WHEEL_HEXDIGEST._replace(
++#        blake2=None,
++#    )
+ 
+ 
+ def test_hash_manager():
diff --git a/dev-python/twine/files/twine-3.0.0-tests.patch b/dev-python/twine/files/twine-3.0.0-tests.patch
new file mode 100644
index 000000000000..e79fa03646d2
--- /dev/null
+++ b/dev-python/twine/files/twine-3.0.0-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/test_upload.py b/tests/test_upload.py
+index c87e16e..1487a0d 100644
+--- a/tests/test_upload.py
++++ b/tests/test_upload.py
+@@ -13,6 +13,7 @@
+ # limitations under the License.
+ import pretend
+ import pytest
++import unittest
+ from requests.exceptions import HTTPError
+ 
+ from twine.commands import upload
+@@ -298,6 +299,7 @@ def test_values_from_env(monkeypatch):
+     "https://test.pypi.org/",
+     "https://pypi.org/"
+ ])
++@unittest.skip("needs internet access")
+ def test_check_status_code_for_wrong_repo_url(repo_url, make_settings):
+     upload_settings = make_settings()
+ 
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
index 57447fb1ddfc..b94c9a70e0d6 100644
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
new file mode 100644
index 000000000000..cbfaa18a3514
--- /dev/null
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5})
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/twine-1.15.0-tests.patch"
+)
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/twine/twine-3.0.0.ebuild b/dev-python/twine/twine-3.0.0.ebuild
new file mode 100644
index 000000000000..75c85fccf49a
--- /dev/null
+++ b/dev-python/twine/twine-3.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/twine-3.0.0-tests.patch"
+)
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# requires internet
+	rm -f tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/twine/twine-3.1.1.ebuild b/dev-python/twine/twine-3.1.1.ebuild
new file mode 100644
index 000000000000..7c6580ab609f
--- /dev/null
+++ b/dev-python/twine/twine-3.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7} pypy{,3})
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/twine-3.0.0-tests.patch"
+)
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# requires internet
+	rm -f tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}