commit: b14e3bfc84365ec48b2f12509fcf4eaaa257fa7b Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> AuthorDate: Fri Sep 9 12:38:20 2016 +0000 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> CommitDate: Fri Sep 9 12:38:20 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=b14e3bfc
dev-python/parse: changes merged to ebuild in tree dev-python/parse/Manifest | 1 - .../parse-1.6.6-python-3.5-tests-compat.patch | 50 ---------------------- dev-python/parse/metadata.xml | 14 ------ dev-python/parse/parse-1.6.6.ebuild | 26 ----------- ...patch => git-cola-2.8-disable-live-tests.patch} | 0 ...-2.6_pre20160313.ebuild => git-cola-2.8.ebuild} | 0 6 files changed, 91 deletions(-) diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest deleted file mode 100644 index b008a9c..0000000 --- a/dev-python/parse/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST parse-1.6.6.tar.gz 24638 SHA256 71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178 SHA512 fae467b6f6e35f04d9e501162117423506701d101b2265e941b5b34420e833a0f4dbc44f62c33d51836a62ef51da9b5b8a3a1d39b3ec490f9eb77c5b6f302cdf WHIRLPOOL c206590ebea8f6b2ef552b0911b83c692a50b0dc395ac76e392a2b4eb16e8c544411da7b7475956183de3d189e6cc27b87752c0aa991dc5e7587e854eea6953c diff --git a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch deleted file mode 100644 index 5183cf5..0000000 --- a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 32f15cfefb7c7b6476360ac65cba807aa3dfccfa Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -Date: Mon, 14 Dec 2015 09:58:19 +0000 -Subject: [PATCH] Fix test_too_many_fields with Python 3.5 - -Python versions before 3.5 had a limit of 100 groups in regular -expressions. This limit was removed during 3.5 development: - -http://bugs.python.org/issue22437 -https://hg.python.org/cpython/rev/0b85ea4bd1af - -The test_too_many_fields test asserts that the limit exists by -attempting to parse a string with 15 fields, which triggers the 100 -named groups limit. - -Adjust the test so that if first checks to see whether the limit of 100 -named groups exists, and only assert that parsing 15 fields fails if -that is the case. ---- - test_parse.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/test_parse.py b/test_parse.py -index c524349..1d50568 100755 ---- a/test_parse.py -+++ b/test_parse.py -@@ -6,6 +6,7 @@ - - import unittest - from datetime import datetime, time -+import re - - import parse - -@@ -624,8 +625,13 @@ def test_mixed_type_variant(self): - self.assertEqual(r.fixed[21], 'spam') - - def test_too_many_fields(self): -- p = parse.compile('{:ti}' * 15) -- self.assertRaises(parse.TooManyFields, p.parse, '') -+ # Python 3.5 removed the limit of 100 named groups in a regular expression, -+ # so only test for the exception if the limit exists. -+ try: -+ re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101))) -+ except AssertionError: -+ p = parse.compile('{:ti}' * 15) -+ self.assertRaises(parse.TooManyFields, p.parse, '') - - - class TestSearch(unittest.TestCase): diff --git a/dev-python/parse/metadata.xml b/dev-python/parse/metadata.xml deleted file mode 100644 index 9a74e7b..0000000 --- a/dev-python/parse/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Alex Brandt</name> - </maintainer> - <longdescription lang="en"> - </longdescription> - <upstream> - <remote-id type="pypi">parse</remote-id> - <remote-id type="github">r1chardj0n3s/parse</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/parse/parse-1.6.6.ebuild b/dev-python/parse/parse-1.6.6.ebuild deleted file mode 100644 index be8e6ea..0000000 --- a/dev-python/parse/parse-1.6.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="parse() is the opposite of format()" -HOMEPAGE="https://github.com/r1chardj0n3s/parse"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="" - -PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" ) - -python_test() { - "${PYTHON}" test_parse.py || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-vcs/git-cola/files/git-cola-2.6_pre20160313-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.8-disable-live-tests.patch similarity index 100% rename from dev-vcs/git-cola/files/git-cola-2.6_pre20160313-disable-live-tests.patch rename to dev-vcs/git-cola/files/git-cola-2.8-disable-live-tests.patch diff --git a/dev-vcs/git-cola/git-cola-2.6_pre20160313.ebuild b/dev-vcs/git-cola/git-cola-2.8.ebuild similarity index 100% rename from dev-vcs/git-cola/git-cola-2.6_pre20160313.ebuild rename to dev-vcs/git-cola/git-cola-2.8.ebuild
