[gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/files/

2023-02-25 Thread Arthur Zamarin 
commit: 36297058bad75bdacd0859c06992b4358c5ff827
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Feb 25 08:01:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 25 18:10:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36297058

dev-python/bleach: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29781
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/bleach/files/bleach-4.1.0-py39.patch | 36 -
 1 file changed, 36 deletions(-)

diff --git a/dev-python/bleach/files/bleach-4.1.0-py39.patch 
b/dev-python/bleach/files/bleach-4.1.0-py39.patch
deleted file mode 100644
index 8460be601a23..
--- a/dev-python/bleach/files/bleach-4.1.0-py39.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/tests/test_clean.py b/tests/test_clean.py
-index 8f816f9..2be6f7b 100644
 a/tests/test_clean.py
-+++ b/tests/test_clean.py
-@@ -525,31 +525,16 @@ def test_attributes_list():
- {"protocols": ["http"]},
- 'valid',
- ),
--(
--'valid',
--{"protocols": ["http"]},
--'valid',
--),
- (
- 'valid',
- {"protocols": ["http"]},
- 'valid',
- ),
--(
--'valid',
--{"protocols": ["http"]},
--'valid',
--),
- (
- 'valid',
- {"protocols": ["http"]},
- 'valid',
- ),
--(
--'valid',
--{"protocols": ["http"]},
--'valid',
--),
- pytest.param(
- *(
- 'valid',

[gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/files/, dev-python/bleach/

2021-09-07 Thread Arthur Zamarin 
commit: 731d715e68ebf5437dce89d82eab776357c93553
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Sep  7 12:47:43 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Sep  7 12:47:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731d715e

dev-python/bleach: add 4.1.0

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/bleach/Manifest  |  1 +
 dev-python/bleach/bleach-4.1.0.ebuild   | 43 +
 dev-python/bleach/files/bleach-4.1.0-py39.patch | 36 +
 3 files changed, 80 insertions(+)

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 20884777f2b..4fb539b48ec 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1 +1,2 @@
 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.1.0.ebuild 
b/dev-python/bleach/bleach-4.1.0.ebuild
new file mode 100644
index 000..0dc5d1156b8
--- /dev/null
+++ b/dev-python/bleach/bleach-4.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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}"/${PN}-4.1.0-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
+
+   sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
+
+   distutils-r1_src_prepare
+}

diff --git a/dev-python/bleach/files/bleach-4.1.0-py39.patch 
b/dev-python/bleach/files/bleach-4.1.0-py39.patch
new file mode 100644
index 000..8460be601a2
--- /dev/null
+++ b/dev-python/bleach/files/bleach-4.1.0-py39.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/test_clean.py b/tests/test_clean.py
+index 8f816f9..2be6f7b 100644
+--- a/tests/test_clean.py
 b/tests/test_clean.py
+@@ -525,31 +525,16 @@ def test_attributes_list():
+ {"protocols": ["http"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ (
+ 'valid',
+ {"protocols": ["http"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ (
+ 'valid',
+ {"protocols": ["http"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ pytest.param(
+ *(
+ 'valid',

[gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/files/, dev-python/bleach/

2020-09-19 Thread Michał Górny 
commit: a0d2dae7c192629e561eae046f6cfa6f094f15c1
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep 19 05:52:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep 19 07:21:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d2dae7

dev-python/bleach: Bump to 3.2.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/bleach/Manifest  |  1 +
 dev-python/bleach/bleach-3.2.1.ebuild   | 39 
 dev-python/bleach/files/bleach-3.2.1-py39.patch | 48 +
 3 files changed, 88 insertions(+)

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 95124802e07..5e5c1451a1f 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,2 +1,3 @@
 DIST bleach-3.1.5.tar.gz 177972 BLAKE2B 
6033871f757247f05ee67f66b3596c7a76a9bc5105113206bc8749f9ed103fb6a7c91630540f5f17ddc17e261b24043cc2edcc2562ea7f4cf54774080854de32
 SHA512 
20db9ab6924a1e884107f30e1059f774b45fd169d3965a61a4ff028e3de17e30be81474d7da89d9275b2173a005c5504a9d11f0e0ca528bf36a9bf08aeed0607
 DIST bleach-3.2.0.tar.gz 178910 BLAKE2B 
e7e97cc367420a656086e5a0e6c1c527348a0edc23c15f5f4b5a40b3079a2fa32b71fd2d99c4db8891e1b2ed06e4ac8ab3d3f0c9a3de77d02499bf32746a9dd7
 SHA512 
06dd7e22204280a03e37cfc303b4de8fc8776e9ac3f7a4c2451f1ff768b68d97c6b00fa42dc275eb4404dae5e448b9385b4e6ee204fdc7e11f31207cdc3d926a
+DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 
5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd
 SHA512 
61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835

diff --git a/dev-python/bleach/bleach-3.2.1.ebuild 
b/dev-python/bleach/bleach-3.2.1.ebuild
new file mode 100644
index 000..4d1438843f6
--- /dev/null
+++ b/dev-python/bleach/bleach-3.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} 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 ~s390 ~sparc 
~x86"
+
+RDEPEND="
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/webencodings[${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
+
+   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
new file mode 100644
index 000..b281031b3df
--- /dev/null
+++ b/dev-python/bleach/files/bleach-3.2.1-py39.patch
@@ -0,0 +1,48 @@
+From ccb0d5e98b30577fe27016b5bc774388f02db876 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+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"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ (
+ 'valid',
+ {"protocols": ["http"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ (
+ 'valid',
+ {"protocols": ["http"]},
+ 'valid',
+ ),
+-(
+-'valid',
+-{"protocols": ["http"]},
+-'valid',
+-),
+ # Disallow implicit http if disallowed
+ ('foo', {"protocols": []}, "foo"),
+ ('foo', {"protocols": []}, 
"foo"),
+-- 
+2.28.0
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/bleach/files/, dev-python/bleach/

2020-05-27 Thread Michał Górny 
commit: 248333025c8435114d05fc5de3dc2a71b6fb589d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed May 27 20:14:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May 27 20:45:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24833302

dev-python/bleach: Port to py39

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/bleach/bleach-3.1.5.ebuild   |  6 -
 dev-python/bleach/files/bleach-3.1.5-py39.patch | 36 +
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/dev-python/bleach/bleach-3.1.5.ebuild 
b/dev-python/bleach/bleach-3.1.5.ebuild
index 43be3b241c1..db2a844f98f 100644
--- a/dev-python/bleach/bleach-3.1.5.ebuild
+++ b/dev-python/bleach/bleach-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -24,6 +24,10 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+   "${FILESDIR}"/${P}-py39.patch
+)
+
 src_prepare() {
# unbundle unpatched broken html5lib
rm -r bleach/_vendor || die

diff --git a/dev-python/bleach/files/bleach-3.1.5-py39.patch 
b/dev-python/bleach/files/bleach-3.1.5-py39.patch
new file mode 100644
index 000..ce1296236b6
--- /dev/null
+++ b/dev-python/bleach/files/bleach-3.1.5-py39.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/test_clean.py b/tests/test_clean.py
+index 133cd82..4dcb9f4 100644
+--- a/tests/test_clean.py
 b/tests/test_clean.py
+@@ -597,31 +597,16 @@ def test_attributes_list():
+ {'protocols': ['http']},
+ 'valid'
+ ),
+-(
+-'valid',
+-{'protocols': ['http']},
+-'valid'
+-),
+ (
+ 'valid',
+ {'protocols': ['http']},
+ 'valid'
+ ),
+-(
+-'valid',
+-{'protocols': ['http']},
+-'valid'
+-),
+ (
+ 'valid',
+ {'protocols': ['http']},
+ 'valid'
+ ),
+-(
+-'valid',
+-{'protocols': ['http']},
+-'valid'
+-),
+ 
+ # Disallow implicit http if disallowed
+ (