From: Daniel Dickman <didickman@gmail.com>
Subject: update devel/py-jsonschema (needed for jupyter)
To: ports@openbsd.org
Date: Mon, 24 Jun 2024 20:54:54 -0400

In order to update jupyter_server to the 2.x series (which is on the path 
for importing jupyterlab and updating jupter notebook), we need to first 
update jsonschema.

The attached includes 6 new ports needed for this update.

And the diff to update jsonschema is included as well. There's a comment 
below in the diff about jupyter_events which is a forthcoming new port 
that's also on the jupyter_server update path.

ok to import these new ports?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
diff -u -p -u -r1.26 Makefile
--- Makefile	6 May 2024 12:23:20 -0000	1.26
+++ Makefile	25 Jun 2024 00:48:45 -0000
@@ -1,33 +1,41 @@
 COMMENT =		implementation of JSON Schema validation for Python
 
-MODPY_EGG_VERSION =	4.17.3
+MODPY_EGG_VERSION =	4.22.0
 DISTNAME =		jsonschema-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
 
 CATEGORIES =		devel
 
-HOMEPAGE =		http://github.com/Julian/jsonschema
+HOMEPAGE =		https://github.com/python-jsonschema/jsonschema
 
 # MIT
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_PI =		Yes
-MODPY_PYBUILD =		hatch-vcs
-MODPY_PYTEST =		Yes
-MODPY_PYTEST_ARGS =	jsonschema
 
 FLAVORS =		python3
 FLAVOR =		python3
 
+MODPY_PI =		Yes
+MODPY_PYBUILD =		hatch-vcs
+
 BUILD_DEPENDS =		devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR}
 
 RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
-			devel/py-pyrsistent${MODPY_FLAVOR}
-# idna can optionally be used at runtime in some circunstances;
-# have seen races with DPB junking so let's force the dep
-RUN_DEPENDS +=		net/py-idna${MODPY_FLAVOR}
+			devel/py-jsonschema-specifications${MODPY_FLAVOR} \
+			devel/py-rpds-py${MODPY_FLAVOR} \
+			textproc/py-referencing${MODPY_FLAVOR}
+
+# jupyter_events needs the "format-nongpl" optional dependencies
+RUN_DEPENDS +=		devel/py-isoduration${MODPY_FLAVOR} \
+			devel/py-rfc3339-validator${MODPY_FLAVOR} \
+			devel/py-rfc3986-validator${MODPY_FLAVOR} \
+			net/py-fqdn${MODPY_FLAVOR} \
+			net/py-idna${MODPY_FLAVOR} \
+			textproc/py-jsonpointer${MODPY_FLAVOR} \
+			www/py-uri-template${MODPY_FLAVOR} \
+			www/py-webcolors${MODPY_FLAVOR}
+
 TEST_DEPENDS =		devel/py-mock${MODPY_FLAVOR} \
 			devel/py-pip${MODPY_FLAVOR} \
 			devel/py-twisted${MODPY_FLAVOR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
diff -u -p -u -r1.7 distinfo
--- distinfo	11 Dec 2022 08:39:39 -0000	1.7
+++ distinfo	25 Jun 2024 00:48:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (jsonschema-4.17.3.tar.gz) = D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0=
-SIZE (jsonschema-4.17.3.tar.gz) = 297785
+SHA256 (jsonschema-4.22.0.tar.gz) = WyLUNKRZNRGa+ZBVLIYuXW1WTo9mASBrMFph/fZhorc=
+SIZE (jsonschema-4.22.0.tar.gz) = 325490
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/pkg/PLIST,v
diff -u -p -u -r1.8 PLIST
--- pkg/PLIST	11 Dec 2022 08:39:39 -0000	1.8
+++ pkg/PLIST	25 Jun 2024 00:48:45 -0000
@@ -18,14 +18,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_format.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_format.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_validators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_keywords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_keywords.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_keywords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_legacy_keywords.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_typing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_typing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_validators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -35,57 +37,56 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/_format.py
-lib/python${MODPY_VERSION}/site-packages/jsonschema/_legacy_validators.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/_keywords.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/_legacy_keywords.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/_types.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/_typing.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/_utils.py
-lib/python${MODPY_VERSION}/site-packages/jsonschema/_validators.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}const_vs_enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}const_vs_enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}contains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}contains.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}issue232.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}issue232.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}json_schema_test_suite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}json_schema_test_suite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}nested_schemas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}nested_schemas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}subcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}subcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}unused_registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}unused_registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}useless_applicator_schemas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}useless_applicator_schemas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}useless_keywords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}useless_keywords.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}validator_creation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/${MODPY_PYCACHE}validator_creation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/const_vs_enum.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/contains.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/issue232/
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/issue232.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/issue232/issue.json
 lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/json_schema_test_suite.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/nested_schemas.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/subcomponents.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/unused_registry.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/useless_applicator_schemas.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/useless_keywords.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/validator_creation.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/cli.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/protocols.py
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft2019-09.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft2020-12.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft3.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft4.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft6.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/draft7.json
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/applicator
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/content
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/core
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/meta-data
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2019-09/validation
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/applicator
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/content
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/core
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/format
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/format-annotation
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/format-assertion
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/meta-data
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/unevaluated
-lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/vocabularies/draft2020-12/validation
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}_suite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}_suite.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}fuzz_validate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -106,7 +107,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_validators.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/_helpers.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/_suite.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/fuzz_validate.py
 lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_cli.py