commit: b2f06364cb075ac8f36e08c54570cabc9b6e7dbe Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 06:37:02 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 07:21:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f06364
dev-python/tappy: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/tappy/Manifest | 1 - dev-python/tappy/files/tappy-2.4-yaml.patch | 61 ----------------------------- dev-python/tappy/tappy-2.4-r1.ebuild | 38 ------------------ 3 files changed, 100 deletions(-) diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest index 6e4e73d34bf..7bfa319b971 100644 --- a/dev-python/tappy/Manifest +++ b/dev-python/tappy/Manifest @@ -1,3 +1,2 @@ -DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c09fde34a4a8ff80c58510a50f5f21295852c14bef506c783cae6293bae521c5fdd696752c221cc49c7d2713e SHA512 2cd0b1b69f155970cf2367766cca96bc8391e074edc754531f0511c3dd027a0a8e95bb8481b627b2610ec9b5f685ebff95f07f5f97eb31c321d96590286be803 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db diff --git a/dev-python/tappy/files/tappy-2.4-yaml.patch b/dev-python/tappy/files/tappy-2.4-yaml.patch deleted file mode 100644 index dee5055ec2f..00000000000 --- a/dev-python/tappy/files/tappy-2.4-yaml.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 62205d0bb2427016938e00fe8e53aed7a947a20d Mon Sep 17 00:00:00 2001 -From: Matt Layman <[email protected]> -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-r1.ebuild b/dev-python/tappy/tappy-2.4-r1.ebuild deleted file mode 100644 index eb3bd8d6e53..00000000000 --- a/dev-python/tappy/tappy-2.4-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 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="dev-python/setuptools[${PYTHON_USEDEP}] - 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 - -PATCHES=( - "${FILESDIR}"/${P}-yaml.patch -)
