From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/html5lib/Manifest | 10 ++--- .../files/html5lib-1.0.1-collections-abc.patch | 44 ++++++++++++++++++++++ dev-python/html5lib/html5lib-0.9999999.ebuild | 34 ----------------- dev-python/html5lib/html5lib-0.999999999.ebuild | 33 ---------------- dev-python/html5lib/html5lib-1.0.1-r1.ebuild | 36 ------------------ dev-python/html5lib/html5lib-1.0.1-r2.ebuild | 38 +++++++++++++++++++ dev-python/html5lib/html5lib-1.0.1.ebuild | 34 ----------------- dev-python/html5lib/metadata.xml | 1 + 8 files changed, 86 insertions(+), 144 deletions(-) create mode 100644 dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch delete mode 100644 dev-python/html5lib/html5lib-0.9999999.ebuild delete mode 100644 dev-python/html5lib/html5lib-0.999999999.ebuild delete mode 100644 dev-python/html5lib/html5lib-1.0.1-r1.ebuild create mode 100644 dev-python/html5lib/html5lib-1.0.1-r2.ebuild delete mode 100644 dev-python/html5lib/html5lib-1.0.1.ebuild (limited to 'dev-python/html5lib') diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest index 9175d4bc151e..da4589a3fa2a 100644 --- a/dev-python/html5lib/Manifest +++ b/dev-python/html5lib/Manifest @@ -1,9 +1,5 @@ +AUX html5lib-1.0.1-collections-abc.patch 1336 BLAKE2B 2b626d56830ff818168ca5b0fa272290e787a700c12b5295e085c0092dbe0746df1336f550573f1960bc0cb911d0639cbeb06a011a9bbeb3b2e42fcbe99e6bef SHA512 ad959536b627984948b984b700758a1e61d7f2e145a920d4020d23e7ff15fe88b31a3569c441df39122ffbedf2a1dfebf17fb00c3194c6ceb69a00f412622ecf AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f2008978378c54a889cdd3cc28f33993d16654dff6ad7dbff69a42dcdef7c3cbd57677c88bec9650fdccdd754b488c956146168290661090a4702c9e SHA512 51435c4094fa0e0c423e21c15709e5ebe10546cbea3ac97635c3d1ebef9287d6c42a479075cc790ccf233c67924a518638d6618f073df2b0871da3fb2838e10e -DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28 -DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2 -EBUILD html5lib-0.9999999.ebuild 1087 BLAKE2B fdb5dcd0769f05bff9dcbe69b72082c0e2207d038f81d4b8f5645fa98221bc500d8277260062f96fc8d33d557c3649f6d09d4c4272a6de39ab3e19f0fdce1ae1 SHA512 2d448fe5f8447d565b7019d01ba7e40723c6a46e33ff955378a7180b4c5cde7d9101abf873a79042411f5ffe020b972b84946b6b85f01fd612247b0abb572a00 -EBUILD html5lib-0.999999999.ebuild 907 BLAKE2B 53f1f0f29ccd6a236de8cf0e2b008a274ada60dbfbb6be014782ca1f52172170eb5ab172046d42951c316f20e0864088fdc9319c9f1ef3fcda22e527fabf3d24 SHA512 cd8546d1343b2af05a5b63e5ec7558f4b13198334602d0e1be5b9747103af45850107acaf13f8ab9364aee31541092fc6305f0d9c0d03dbeb8cbca201673808f -EBUILD html5lib-1.0.1-r1.ebuild 975 BLAKE2B 818d5524163846aead7be1f617e0f8124994637e96dbbf902ab3dd2f5aff9d1a8ba49080404517a602a2d4f2846123cd59fbad893f22075b3af1fa24f043bbf0 SHA512 5893214862f1fae557fdc2f2606f00da31910a3802772a0f03b94073792fbcaad44868811f375e2ad023bb8d74ff4b3e9e2bff264bf01174b4fe83ca9331fc10 -EBUILD html5lib-1.0.1.ebuild 910 BLAKE2B 77e3d9e935e9c8d5b8b4e529311de6ff90a9622a534da90a3ab403d54319dbbc2ef53a294e46dd4ebc9ee1639b57ac96c366825b4d0ece0aa5aa6edcde668fc7 SHA512 fc8d52d5c1575bd70269316334f1b7b0a94e674891535842b680311a36c584aa302458345c5477237f1d2434b618ce4edab300dda4937a2b57e2cd0fc6998d50 -MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a +EBUILD html5lib-1.0.1-r2.ebuild 1043 BLAKE2B f99581e8ddcb988421da4bc31e5c933d7e4f8f3c471dcb67cbf6b7cf51952b290e60d2f266f204eb507528e41718c976f79530c4f1387a3722c3c63fb0a3402c SHA512 0fb20fad6d89a844f460d7c580b1200e163c3abb586cb773e37d4298c7f51b99ffb222460d595c1a5b2a7dcb42729945699a6c846533fab93902f0a54600c793 +MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b diff --git a/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch new file mode 100644 index 000000000000..d5a9dcac299d --- /dev/null +++ b/dev-python/html5lib/files/html5lib-1.0.1-collections-abc.patch @@ -0,0 +1,44 @@ +From 4f9235752cea29c5a31721440578b430823a1e69 Mon Sep 17 00:00:00 2001 +From: 5j9 <5j9@users.noreply.github.com> +Date: Mon, 1 Oct 2018 15:02:33 +0330 +Subject: [PATCH] Try to import MutableMapping from collections.abc (#403) + +Note that collections.abc has been added in Python 3.3. + +Fixes #402 +--- + html5lib/_trie/_base.py | 5 ++++- + html5lib/treebuilders/dom.py | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/html5lib/_trie/_base.py b/html5lib/_trie/_base.py +index a1158bbb..6b71975f 100644 +--- a/html5lib/_trie/_base.py ++++ b/html5lib/_trie/_base.py +@@ -1,6 +1,9 @@ + from __future__ import absolute_import, division, unicode_literals + +-from collections import Mapping ++try: ++ from collections.abc import Mapping ++except ImportError: # Python 2.7 ++ from collections import Mapping + + + class Trie(Mapping): +diff --git a/html5lib/treebuilders/dom.py b/html5lib/treebuilders/dom.py +index dcfac220..d8b53004 100644 +--- a/html5lib/treebuilders/dom.py ++++ b/html5lib/treebuilders/dom.py +@@ -1,7 +1,10 @@ + from __future__ import absolute_import, division, unicode_literals + + +-from collections import MutableMapping ++try: ++ from collections.abc import MutableMapping ++except ImportError: # Python 2.7 ++ from collections import MutableMapping + from xml.dom import minidom, Node + import weakref + diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild deleted file mode 100644 index bdac7adf0000..000000000000 --- a/dev-python/html5lib/html5lib-0.9999999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_6 pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -python_test() { - # https://github.com/html5lib/html5lib-python/issues/224 - # https://bugs.gentoo.org/show_bug.cgi?id=571644 - has_version =dev-python/lxml-3.5.0 && \ - einfo "test are broken with dev-python/lxml-3.5.0" && \ - einfo "https://github.com/html5lib/html5lib-python/issues/224" && \ - return - nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild deleted file mode 100644 index 427a82743f70..000000000000 --- a/dev-python/html5lib/html5lib-0.999999999.ebuild +++ /dev/null @@ -1,33 +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 pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}] - dev-python/webencodings[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-expect[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - )" - -python_test() { - py.test -v || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild b/dev-python/html5lib/html5lib-1.0.1-r1.ebuild deleted file mode 100644 index 3b5031979f80..000000000000 --- a/dev-python/html5lib/html5lib-1.0.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" -IUSE="test" - -RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}] - dev-python/webencodings[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-expect[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - )" - -RESTRICT+=" !test? ( test )" - -PATCHES=( - # https://github.com/html5lib/html5lib-python/pull/429 - "${FILESDIR}/html5lib-python-1.0.1-support-pytest4.patch" -) - -distutils_enable_tests pytest diff --git a/dev-python/html5lib/html5lib-1.0.1-r2.ebuild b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild new file mode 100644 index 000000000000..89f23560821f --- /dev/null +++ b/dev-python/html5lib/html5lib-1.0.1-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 + +DESCRIPTION="HTML parser based on the HTML5 specification" +HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos" +IUSE="test" + +RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}] + dev-python/webencodings[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-expect[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + )" + +RESTRICT+=" !test? ( test )" + +PATCHES=( + # fix deprecated import + "${FILESDIR}/html5lib-1.0.1-collections-abc.patch" + # https://github.com/html5lib/html5lib-python/pull/429 + "${FILESDIR}/html5lib-python-1.0.1-support-pytest4.patch" +) + +distutils_enable_tests pytest diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild deleted file mode 100644 index e4884a7de3c1..000000000000 --- a/dev-python/html5lib/html5lib-1.0.1.ebuild +++ /dev/null @@ -1,34 +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} pypy3 ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -DESCRIPTION="HTML parser based on the HTML5 specification" -HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos" -IUSE="test" - -RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}] - dev-python/webencodings[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-expect[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - )" - -RESTRICT="!test? ( test )" - -python_test() { - py.test -v || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/html5lib/metadata.xml b/dev-python/html5lib/metadata.xml index a9695174a877..db9b5eab8d55 100644 --- a/dev-python/html5lib/metadata.xml +++ b/dev-python/html5lib/metadata.xml @@ -10,6 +10,7 @@ to conform to the WHATWG HTML specification, as is implemented by all major web browsers. + html5lib html5lib/html5lib-python -- cgit v1.2.3