* [gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/, dev-python/bleach/files/
@ 2021-10-09 19:31 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2021-10-09 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 5f63eed7aeff34e2d896fc0e01d7c6cb6167a29a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 9 19:28:18 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 9 19:31:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f63eed7
dev-python/bleach: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bleach/Manifest | 1 -
dev-python/bleach/bleach-4.0.0.ebuild | 41 ---------------------
dev-python/bleach/files/bleach-3.2.1-py39.patch | 48 -------------------------
3 files changed, 90 deletions(-)
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 4fb539b48ec..a597f703e6a 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,2 +1 @@
-DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
diff --git a/dev-python/bleach/bleach-4.0.0.ebuild b/dev-python/bleach/bleach-4.0.0.ebuild
deleted file mode 100644
index f378247bac7..00000000000
--- a/dev-python/bleach/bleach-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
- https://github.com/mozilla/bleach/
- https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
- >=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
- # unbundle unpatched broken html5lib
- rm -r bleach/_vendor || die
- sed -i -e 's:bleach\._vendor\.::' \
- bleach/html5lib_shim.py \
- bleach/sanitizer.py \
- tests/test_clean.py || die
- # indirect html5lib deps
- sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/files/bleach-3.2.1-py39.patch b/dev-python/bleach/files/bleach-3.2.1-py39.patch
deleted file mode 100644
index b281031b3df..00000000000
--- a/dev-python/bleach/files/bleach-3.2.1-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ccb0d5e98b30577fe27016b5bc774388f02db876 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Sep 2020 08:00:51 +0200
-Subject: [PATCH] Remove tests relying on py<3.9 behavior
-
----
- tests/test_clean.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/test_clean.py b/tests/test_clean.py
-index 1cd58df..2b2f7c5 100644
---- a/tests/test_clean.py
-+++ b/tests/test_clean.py
-@@ -499,31 +499,16 @@ def test_attributes_list():
- {"protocols": ["http"]},
- '<a href="example.com">valid</a>',
- ),
-- (
-- '<a href="example.com:8000">valid</a>',
-- {"protocols": ["http"]},
-- '<a href="example.com:8000">valid</a>',
-- ),
- (
- '<a href="localhost">valid</a>',
- {"protocols": ["http"]},
- '<a href="localhost">valid</a>',
- ),
-- (
-- '<a href="localhost:8000">valid</a>',
-- {"protocols": ["http"]},
-- '<a href="localhost:8000">valid</a>',
-- ),
- (
- '<a href="192.168.100.100">valid</a>',
- {"protocols": ["http"]},
- '<a href="192.168.100.100">valid</a>',
- ),
-- (
-- '<a href="192.168.100.100:8000">valid</a>',
-- {"protocols": ["http"]},
-- '<a href="192.168.100.100:8000">valid</a>',
-- ),
- # Disallow implicit http if disallowed
- ('<a href="example.com">foo</a>', {"protocols": []}, "<a>foo</a>"),
- ('<a href="example.com:8000">foo</a>', {"protocols": []}, "<a>foo</a>"),
---
-2.28.0
-
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/, dev-python/bleach/files/
@ 2023-01-24 7:04 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2023-01-24 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 713a5d6446b6d906d78ca057183f99451f005bed
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:36:45 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 07:04:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713a5d64
dev-python/bleach: Bump to 6.0.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/bleach/Manifest | 1 +
dev-python/bleach/bleach-6.0.0.ebuild | 46 ++++++++++++++++++++++++
dev-python/bleach/files/bleach-6.0.0-py39.patch | 48 +++++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index cd9a7af8b9dc..77a6e9c7d92d 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1 +1,2 @@
DIST bleach-5.0.1.tar.gz 199642 BLAKE2B 8d06dd38e89b91bf48f3481b5337b8d9700d8cc88faf3a260898b2b8f15ecf5c5160f96bff2c5ce02f361b773b0ce9a51322d9836dcc99b7878921846e8da182 SHA512 6c8e80eaf6db6f0e6d9066f3443192f44c489e079945b6d11b11e7eb270ea865011019e05d43c7896262dc11ca168e697630d9da8dca9f5bb48f0e2161fda6c8
+DIST bleach-6.0.0.tar.gz 201298 BLAKE2B e4af5da351fdb63bc75b935f70f40434bd81c49cde4f584901397e5fd4ac4507d2e29eb283ff28a764018dbd795021e2edf1f43385ff8a2d7d8affd358fc0e31 SHA512 95900e4347c1f7d0aa5b2e8fbf43fac6410dd6bbbac988fb3f407a964d0aa1dc51fe3cf17459e6ce762a02b45bb3d20b539ca05727278d120aee9500cf0d208a
diff --git a/dev-python/bleach/bleach-6.0.0.ebuild b/dev-python/bleach/bleach-6.0.0.ebuild
new file mode 100644
index 000000000000..350261336111
--- /dev/null
+++ b/dev-python/bleach/bleach-6.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+ https://github.com/mozilla/bleach/
+ https://pypi.org/project/bleach/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/bleach-6.0.0-py39.patch
+)
+
+src_prepare() {
+ # unbundle unpatched broken html5lib
+ rm -r bleach/_vendor || die
+ sed -i -e 's:bleach\._vendor\.parse:urllib.parse:' \
+ bleach/parse_shim.py || die
+ sed -i -e 's:bleach\._vendor\.::' \
+ bleach/html5lib_shim.py \
+ bleach/sanitizer.py \
+ tests/test_clean.py || die
+ # indirect html5lib deps
+ sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/files/bleach-6.0.0-py39.patch b/dev-python/bleach/files/bleach-6.0.0-py39.patch
new file mode 100644
index 000000000000..02ecb614c8b9
--- /dev/null
+++ b/dev-python/bleach/files/bleach-6.0.0-py39.patch
@@ -0,0 +1,48 @@
+From d6d734f6fbeee2c091212d42e3ea730a1230aad5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 24 Jan 2023 07:35:45 +0100
+Subject: [PATCH] Remove tests broken by py3.9
+
+---
+ tests/test_clean.py | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/tests/test_clean.py b/tests/test_clean.py
+index 73946a1..f798a15 100644
+--- a/tests/test_clean.py
++++ b/tests/test_clean.py
+@@ -551,31 +551,16 @@ def test_attributes_list():
+ {"protocols": {"http"}},
+ '<a href="example.com">valid</a>',
+ ),
+- (
+- '<a href="example.com:8000">valid</a>',
+- {"protocols": {"http"}},
+- '<a href="example.com:8000">valid</a>',
+- ),
+ (
+ '<a href="localhost">valid</a>',
+ {"protocols": {"http"}},
+ '<a href="localhost">valid</a>',
+ ),
+- (
+- '<a href="localhost:8000">valid</a>',
+- {"protocols": {"http"}},
+- '<a href="localhost:8000">valid</a>',
+- ),
+ (
+ '<a href="192.168.100.100">valid</a>',
+ {"protocols": {"http"}},
+ '<a href="192.168.100.100">valid</a>',
+ ),
+- (
+- '<a href="192.168.100.100:8000">valid</a>',
+- {"protocols": {"http"}},
+- '<a href="192.168.100.100:8000">valid</a>',
+- ),
+ pytest.param(
+ *(
+ '<a href="192.168.100.100:8000/foo#bar">valid</a>',
+--
+2.39.1
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-24 7:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-09 19:31 [gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/, dev-python/bleach/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-01-24 7:04 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox