Have you tested the jsonschema update with the other 2 ports that use it
(anki, py-nbformat)?
jsonschema can move to py3-only.
On 2021/09/17 11:39, Renaud Allard wrote:
> Hello,
>
> Here is an update for net/synapse to 1.42.0. Unfortunately, it is also
> dependent on devel/py-jsonschema >= 3.0.0. So here is the patch for that one
> too.
>
> Best Regards
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 21 May 2021 19:50:26 -0000 1.14
> +++ Makefile 17 Sep 2021 09:29:35 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT = implementation of JSON Schema validation for Python
>
> -MODPY_EGG_VERSION = 2.6.0
> +MODPY_EGG_VERSION = 3.2.0
> DISTNAME = jsonschema-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 3
>
> CATEGORIES = devel
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 5 Mar 2017 18:18:24 -0000 1.2
> +++ distinfo 17 Sep 2021 09:29:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (jsonschema-2.6.0.tar.gz) =
> b/XzGAhwg2yuQPBvoQQZ9VcggXXxOte8Jsqne+sfbgI=
> -SIZE (jsonschema-2.6.0.tar.gz) = 53252
> +SHA256 (jsonschema-3.2.0.tar.gz) =
> yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=
> +SIZE (jsonschema-3.2.0.tar.gz) = 167226
> Index: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> ===================================================================
> RCS file: patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> diff -N patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
> --- patches/patch-jsonschema_tests_test_jsonschema_test_suite_py 16 Aug
> 2015 19:46:22 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-jsonschema_tests_test_jsonschema_test_suite_py,v 1.1.1.1
> 2015/08/16 19:46:22 edd Exp $
> -
> -Bad interpreter path.
> -
> ---- jsonschema/tests/test_jsonschema_test_suite.py.orig Sun Aug 16
> 17:51:04 2015
> -+++ jsonschema/tests/test_jsonschema_test_suite.py Sun Aug 16 17:51:16 2015
> -@@ -47,7 +47,7 @@ TESTS_DIR = os.path.join(SUITE, "tests")
> - JSONSCHEMA_SUITE = os.path.join(SUITE, "bin", "jsonschema_suite")
> -
> - remotes_stdout = subprocess.Popen(
> -- ["python", JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
> -+ [sys.executable, JSONSCHEMA_SUITE, "remotes"], stdout=subprocess.PIPE,
> - ).stdout
> -
> - with closing(remotes_stdout):
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-jsonschema/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 19 Feb 2021 23:13:01 -0000 1.4
> +++ pkg/PLIST 17 Sep 2021 09:29:35 -0000
> @@ -15,39 +15,55 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> 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}pyc
> +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}_reflect.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
>
> 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}pyc
> -lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>
> 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/_reflect.py
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/_types.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/_version.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}pyc
> +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}pyc
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/issue232.py
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/benchmarks/json_schema_test_suite.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/cli.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/compat.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/exceptions.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/schemas/
> 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/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}pyc
> -lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> +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}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_cli.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_format.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_jsonschema_test_suite.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/${MODPY_PYCACHE}test_types.${MODPY_PYC_MAGIC_TAG}pyc
>
> 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/compat.py
> +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/test_cli.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_exceptions.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_format.py
>
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_jsonschema_test_suite.py
> +lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_types.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_validators.py
> lib/python${MODPY_VERSION}/site-packages/jsonschema/validators.py
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/synapse/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 1 Sep 2021 13:28:58 -0000 1.24
> +++ Makefile 17 Sep 2021 09:29:16 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = open network for secure, decentralized communication
>
> -MODPY_EGG_VERSION = 1.41.1
> +MODPY_EGG_VERSION = 1.42.0
>
> GH_ACCOUNT = matrix-org
> GH_PROJECT = synapse
> @@ -30,7 +30,7 @@ RUN_DEPENDS = textproc/py-lxml${MODPY_FL
> textproc/py-ijson${MODPY_FLAVOR} \
> devel/py-asn1${MODPY_FLAVOR} \
> devel/py-blist${MODPY_FLAVOR} \
> - devel/py-jsonschema${MODPY_FLAVOR} \
> + devel/py-jsonschema${MODPY_FLAVOR}>=3.0.0 \
> devel/py-twisted${MODPY_FLAVOR} \
> devel/py-simplejson${MODPY_FLAVOR} \
> devel/py-typing-extensions${MODPY_FLAVOR} \
> @@ -41,6 +41,7 @@ RUN_DEPENDS = textproc/py-lxml${MODPY_FL
> devel/py-incremental${MODPY_FLAVOR} \
> devel/py-automat${MODPY_FLAVOR} \
> devel/py-more-itertools${MODPY_FLAVOR} \
> + devel/py-pyrsistent${MODPY_FLAVOR} \
> net/py-msgpack${MODPY_FLAVOR} \
> net/py-netaddr${MODPY_FLAVOR} \
> telephony/py-phonenumbers${MODPY_FLAVOR} \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/synapse/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- distinfo 1 Sep 2021 13:28:58 -0000 1.20
> +++ distinfo 17 Sep 2021 09:29:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (synapse-1.41.1.tar.gz) = 6+vIEMAfa8/JcKUyfzFJll2mBiGrkXMN2X+EnT0znv4=
> -SIZE (synapse-1.41.1.tar.gz) = 7436053
> +SHA256 (synapse-1.42.0.tar.gz) = Rtzwd4nq/9jcOpra4wcHu1mrY+3LyAMh3nznLiN3V1U=
> +SIZE (synapse-1.42.0.tar.gz) = 7462129
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- pkg/PLIST 1 Sep 2021 13:28:58 -0000 1.19
> +++ pkg/PLIST 17 Sep 2021 09:29:17 -0000
> @@ -281,6 +281,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}event_auth.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}federation.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}federation_event.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}groups_local.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}initial_sync.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -324,6 +325,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/event_auth.py
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/events.py
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/federation.py
> +lib/python${MODPY_VERSION}/site-packages/synapse/handlers/federation_event.py
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/groups_local.py
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/identity.py
> lib/python${MODPY_VERSION}/site-packages/synapse/handlers/initial_sync.py
> @@ -591,6 +593,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/registration.txt
>
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/registration_failure.html
>
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/registration_success.html
> +lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/registration_token.html
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/room.html
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/room.txt
> lib/python${MODPY_VERSION}/site-packages/synapse/res/templates/sso.css
> @@ -622,7 +625,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}event_reports.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}media.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}purge_room_servlet.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}registration_tokens.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}rooms.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}server_notice_servlet.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -633,7 +636,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/event_reports.py
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/groups.py
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/media.py
> -lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/purge_room_servlet.py
> +lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/registration_tokens.py
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/rooms.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/server_notice_servlet.py
> lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/statistics.py
> @@ -916,6 +919,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}roommember.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}signatures.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/${MODPY_PYCACHE}state_deltas.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -962,6 +966,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/room.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/roommember.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/search.py
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/session.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/signatures.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/state.py
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/databases/main/state_deltas.py
> @@ -1360,6 +1365,10 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/${MODPY_PYCACHE}03recreate_min_depth.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/01insertion_event_extremities.sql
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/63/
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/63/01create_registration_tokens.sql
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/63/02delete_unlinked_email_pushers.sql
> +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/63/03session_store.sql
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/
>
> lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/application_services.sql
