I plan to commit an update to bleach soon since tinycss2 was updated to
1.4.0 which the current version of bleach doesn't support.
This version mismatch is now a blocker for updating jupyter notebook.
Note that bleach is EOL upstream so we likely won't see any more updates
and therefore I added an upper bound on tinycss2<1.5 in this port.
There are only 2 consumers of bleach in the tree: synapse and nbconvert.
Both build following the bleach update although I'm not familiar with
synapse and how to use it.
Any oks on the update below?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/py-bleach/Makefile,v
diff -u -p -u -r1.19 Makefile
--- Makefile 29 Apr 2025 10:40:29 -0000 1.19
+++ Makefile 15 May 2025 01:29:16 -0000
@@ -1,9 +1,9 @@
COMMENT = easy whitelist-based HTML-sanitizing tool
-MODPY_DISTV = 5.0.1
+# bleach is discontinued upstream
+MODPY_DISTV = 6.2.0
DISTNAME = bleach-${MODPY_DISTV}
PKGNAME = py-${DISTNAME}
-REVISION = 4
CATEGORIES = www
@@ -19,9 +19,9 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_PYBUILD = setuptools
-RUN_DEPENDS = devel/py-six \
- sysutils/py-packaging \
+RUN_DEPENDS = textproc/py-tinycss2<1.5 \
textproc/py-webencodings
+
BUILD_DEPENDS = devel/py-test-runner
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/py-bleach/distinfo,v
diff -u -p -u -r1.4 distinfo
--- distinfo 3 Oct 2022 22:11:18 -0000 1.4
+++ distinfo 15 May 2025 01:29:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (bleach-5.0.1.tar.gz) = DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw=
-SIZE (bleach-5.0.1.tar.gz) = 199642
+SHA256 (bleach-6.2.0.tar.gz) = Ej6JQRi4pZn9gNPsGm1Mx85OWIKxMXp+G6abVulfmR8=
+SIZE (bleach-6.2.0.tar.gz) = 203083
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-bleach/pkg/PLIST,v
diff -u -p -u -r1.8 PLIST
--- pkg/PLIST 29 Apr 2025 10:40:29 -0000 1.8
+++ pkg/PLIST 15 May 2025 01:29:16 -0000
@@ -23,6 +23,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}parse_shim.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}sanitizer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}six_shim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bleach/${MODPY_PYCACHE}six_shim.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/
lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/README.rst
lib/python${MODPY_VERSION}/site-packages/bleach/_vendor/__init__.py
@@ -161,3 +163,4 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/bleach/linkifier.py
lib/python${MODPY_VERSION}/site-packages/bleach/parse_shim.py
lib/python${MODPY_VERSION}/site-packages/bleach/sanitizer.py
+lib/python${MODPY_VERSION}/site-packages/bleach/six_shim.py
