commit: 113ba946480cdfdc0ec71a2259c44c0341bca5c6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 21 20:10:26 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Nov 21 20:11:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113ba946
dev-python/python-debian: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/python-debian/Manifest | 1 - .../files/0.1.39-disable-apt-pkg.patch | 146 --------------------- .../python-debian/python-debian-0.1.40.ebuild | 36 ----- 3 files changed, 183 deletions(-) diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest index 7114386ff375..85fe2d44c9e3 100644 --- a/dev-python/python-debian/Manifest +++ b/dev-python/python-debian/Manifest @@ -1,2 +1 @@ -DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095 DIST python-debian_0.1.42.tar.xz 173928 BLAKE2B 615be084cba8ff11eaaefc1b40335b73a16604b864600dbeb717ba65ee94f1d3a62f845a59c3db5b915346de4211fdde811593db989b143f4d60e7b425b98d2d SHA512 923831077d0a42dafd22277579e714af33b99612e5282f5d95bc884b2faec05321f8caaad20b72b25ce88d8c2449a6a23913c5377ed0bdc30d4ef87e39341ff7 diff --git a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch b/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch deleted file mode 100644 index 6765b2f6c3a0..000000000000 --- a/dev-python/python-debian/files/0.1.39-disable-apt-pkg.patch +++ /dev/null @@ -1,146 +0,0 @@ -From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Mon, 8 Feb 2021 22:24:33 -0500 -Subject: [PATCH] Disable apt_pkg support - ---- - lib/debian/deb822.py | 4 +-- - lib/debian/tests/test_deb822.py | 58 --------------------------------- - 2 files changed, 2 insertions(+), 60 deletions(-) - -diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py -index 46cf81a..158033f 100644 ---- a/lib/debian/deb822.py -+++ b/lib/debian/deb822.py -@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin): - def iter_paragraphs(cls, - sequence, # type: InputDataType - fields=None, # type: Optional[List[str]] -- use_apt_pkg=True, # type: bool -+ use_apt_pkg=False, # type: bool - shared_storage=False, # type: bool - encoding="utf-8", # type: str - strict=None, # type: Optional[Dict[str, bool]] -@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin): - def iter_paragraphs(cls, - sequence, # type: InputDataType - fields=None, # type: Optional[List[str]] -- use_apt_pkg=True, # type: bool -+ use_apt_pkg=False, # type: bool - shared_storage=False, # type: bool - encoding="utf-8", # type: str - strict=None, # type: Optional[Dict[str, bool]] -diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py -index f386391..7fb11fa 100755 ---- a/lib/debian/tests/test_deb822.py -+++ b/lib/debian/tests/test_deb822.py -@@ -42,8 +42,6 @@ else: - from StringIO import StringIO - BytesIO = StringIO - --import apt_pkg -- - from debian import deb822 - from debian.debian_support import Version - -@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh: - for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False): - self.assertWellParsed(d, PARSED_PACKAGE) - -- with self.assertWarns(UserWarning): -- # The StringIO is not a real file so this will raise a warning -- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True): -- self.assertWellParsed(d, PARSED_PACKAGE) -- - def test_iter_paragraphs_file(self): - # type: () -> None - text = StringIO() -@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh: - for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False): - self.assertWellParsed(d, PARSED_PACKAGE) - -- fh.seek(0) -- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True): -- self.assertWellParsed(d, PARSED_PACKAGE) -- - - def test_iter_paragraphs_with_gpg(self): - # type: () -> None -@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh: - test_count(deb822.Deb822.iter_paragraphs, 2) - test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False) - -- # apt_pkg used, should not split -- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True) -- - # Specialised iter_paragraphs force use of apt_pkg and don't split -- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True) -- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True) - test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False) - test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False) - -@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh: - s.write(b"\n") - self.assertEqual(s.getvalue(), packages_content) - -- def test_iter_paragraphs_apt_shared_storage_packages(self): -- # type: () -> None -- self._test_iter_paragraphs(find_test_file("test_Packages"), -- deb822.Packages, -- use_apt_pkg=True, shared_storage=True) -- def test_iter_paragraphs_apt_no_shared_storage_packages(self): -- # type: () -> None -- self._test_iter_paragraphs(find_test_file("test_Packages"), -- deb822.Packages, -- use_apt_pkg=True, shared_storage=False) - def test_iter_paragraphs_no_apt_no_shared_storage_packages(self): - # type: () -> None - self._test_iter_paragraphs(find_test_file("test_Packages"), - deb822.Packages, - use_apt_pkg=False, shared_storage=False) - -- def test_iter_paragraphs_apt_shared_storage_sources(self): -- # type: () -> None -- self._test_iter_paragraphs(find_test_file("test_Sources"), -- deb822.Sources, -- use_apt_pkg=True, shared_storage=True) -- def test_iter_paragraphs_apt_no_shared_storage_sources(self): -- # type: () -> None -- self._test_iter_paragraphs(find_test_file("test_Sources"), -- deb822.Sources, -- use_apt_pkg=True, shared_storage=False) - def test_iter_paragraphs_no_apt_no_shared_storage_sources(self): - # type: () -> None - self._test_iter_paragraphs(find_test_file("test_Sources"), -@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats - self.assertWellParsed(paragraphs[i], - PARSED_PARAGRAPHS_WITH_COMMENTS[i]) - -- def test_iter_paragraphs_comments_use_apt_pkg(self): -- # type: () -> None -- """ apt_pkg does not support comments within multiline fields -- -- This test checks that a file with comments inside multiline fields -- generates an error from the apt_pkg parser. -- -- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35 -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351 -- """ -- try: -- fd, filename = tempfile.mkstemp() -- fp = os.fdopen(fd, 'wb') -- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8')) -- fp.close() -- -- with open_utf8(filename) as fh: -- with self.assertRaises(apt_pkg.Error): -- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True)) -- finally: -- os.remove(filename) -- - def test_iter_paragraphs_comments_native(self): - # type: () -> None - paragraphs = list(deb822.Deb822.iter_paragraphs( --- -2.30.0 - diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild deleted file mode 100644 index 093dbb450db3..000000000000 --- a/dev-python/python-debian/python-debian-0.1.40.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Python modules to work with Debian-related data formats" -HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"; -SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="amd64 arm x86" - -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( app-arch/dpkg ) -" - -distutils_enable_tests unittest - -PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" ) - -python_compile_all() { - ${EPYTHON} lib/debian/doc-debtags > README.debtags || die -} - -python_test() { - eunittest lib -}
