gentoo resync : 25.04.2020

4 files changed, 107 insertions, 9 deletions

diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index e614692605b6..070952ff60c0 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,6 @@
+AUX tappy-2.4-yaml.patch 2387 BLAKE2B 22e64a124a81f3459bad202cf22112a2749c752870a1d47e768e3df4ef087f7d20f8ab9ae40f4f08cb69f5be22b6d5a364d8408dca76268f2b91328420b464b6 SHA512 e2c94768a23e816c126fcd1c11d550492743682c0a347b3cb734adf741e51f693f46c81b9da0688976cc4f0bea153665e338aa50e95e6334182f075e10f811dc
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1059 BLAKE2B b119c859425b9194a6b34c930065153169195cdeeb5f325a3da89510e2d7976adc0097c35202d4bd28b6445895179a02ca44e95f97640e548a63060b81e94146 SHA512 8c92cfb1f24475b50a759162a85e5d14f75831e1b7a714c64ce33015d08d72c11eca9ea6fac0cf2e09b6e8e3e4b1afcd13b9e4a9effff440abca6dba21217662
+DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
+EBUILD tappy-2.4-r1.ebuild 968 BLAKE2B b46281f8c0c86593aaabd728abb39c4552d6fc7603286cb60c21dee9ba35d912745db8cde2c97e6d8924f50f180abd41020d770e5aefffa40488109262b193e3 SHA512 e891916c994ced9066f0b0433f686554acc23908290ea0afa5ff88cd8b883e9b664801d700228c282e6bea36db2e2cdc6131f31a3bb4feb63cdd411cdc84c2ee
+EBUILD tappy-3.0.ebuild 914 BLAKE2B 601b535c2eb4ec7861fe719b89f868f185b8632aec0b222d0d750f7ccf80bb885b5276ef275027afaa6bb10ed9a9810e13cb804b3eb974dfe7ea3dfe95e714cc SHA512 fb305a5053ef78eb568cd443b151b45aebfde9260cab807253032f8ac88cdf93febbcbb6bc4d1eb7731641a784ed4995ab39e311457fd93fd34eddb99abcb841
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/files/tappy-2.4-yaml.patch b/dev-python/tappy/files/tappy-2.4-yaml.patch
new file mode 100644
index 000000000000..dee5055ec2f1
--- /dev/null
+++ b/dev-python/tappy/files/tappy-2.4-yaml.patch
@@ -0,0 +1,61 @@
+From 62205d0bb2427016938e00fe8e53aed7a947a20d Mon Sep 17 00:00:00 2001
+From: Matt Layman <matthewlayman@gmail.com>
+Date: Sat, 14 Dec 2019 21:20:22 -0500
+Subject: [PATCH] Use PyYAML safe loader and remove deprecation warning. (#103)
+
+Fixes #102
+---
+ tap/line.py              | 2 +-
+ tap/tests/test_parser.py | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+(mgorny: rebased for 2.4 and included test fixes that are part
+ of irrelevant commit upstream)
+
+diff --git a/tap/line.py b/tap/line.py
+index 352bc1b..c4d0ca6 100644
+--- a/tap/line.py
++++ b/tap/line.py
+@@ -88,7 +88,7 @@ class Result(Line):
+         """
+         if LOAD_YAML and self._yaml_block is not None:
+             try:
+-                yaml_dict = yaml.load(self._yaml_block)
++                yaml_dict = yaml.load(self._yaml_block, Loader=yaml.SafeLoader)
+                 return yaml_dict
+             except yaml.error.YAMLError:
+                 print('Error parsing yaml block. Check formatting.')
+diff --git a/tap/tests/test_parser.py b/tap/tests/test_parser.py
+index 4e919d1..1e78039 100644
+--- a/tap/tests/test_parser.py
++++ b/tap/tests/test_parser.py
+@@ -235,7 +235,7 @@ class TestParser(unittest.TestCase):
+         try:
+             import yaml
+             from more_itertools import peekable  # noqa
+-            converted_yaml = yaml.load(u"""test: sample yaml""")
++            converted_yaml = yaml.safe_load(u"""test: sample yaml""")
+             self.assertEqual(4, len(lines))
+             self.assertEqual(13, lines[0].version)
+             self.assertEqual(converted_yaml, lines[2].yaml_block)
+@@ -265,7 +265,7 @@ class TestParser(unittest.TestCase):
+         try:
+             import yaml
+             from more_itertools import peekable  # noqa
+-            converted_yaml = yaml.load(u"""test: sample yaml""")
++            converted_yaml = yaml.safe_load(u"""test: sample yaml""")
+             self.assertEqual(4, len(lines))
+             self.assertEqual(13, lines[0].version)
+             self.assertEqual(converted_yaml, lines[2].yaml_block)
+@@ -300,7 +300,7 @@ class TestParser(unittest.TestCase):
+         try:
+             import yaml
+             from more_itertools import peekable  # noqa
+-            converted_yaml = yaml.load(u"""
++            converted_yaml = yaml.safe_load(u"""
+                message: test
+                severity: fail
+                data:
+-- 
+2.26.2
+
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4-r1.ebuild
index 7cffc97077fc..214efd834439 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4-r1.ebuild
@@ -10,12 +10,12 @@ MY_PN=tap.py
 DESCRIPTION="Test Anything Protocol (TAP) tools"
 HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
-IUSE="test yaml"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+IUSE="yaml"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	yaml? (
@@ -23,7 +23,6 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -32,8 +31,8 @@ DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
 		' -2)
 	)"
 
-S=${WORKDIR}/${MY_PN}-${PV}
+distutils_enable_tests unittest
 
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-yaml.patch
+)
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
new file mode 100644
index 000000000000..8143c4ab1f2c
--- /dev/null
+++ b/dev-python/tappy/tappy-3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN=tap.py
+DESCRIPTION="Test Anything Protocol (TAP) tools"
+HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="yaml"
+
+RDEPEND="
+	yaml? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+		' -2)
+	)"
+
+distutils_enable_tests unittest