On 2021/10/21 09:30, Renaud Allard wrote:
> Here is an updated version with py-jsonschema 4.1.2
Let's use the same comment in the patch as net/py-minimalmodbus,
and some bits for py2 removal need doing differently. There are missing
deps too. I'll commit this:
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2129
diff -u -p -r1.2129 Makefile
--- Makefile 8 Oct 2021 15:27:22 -0000 1.2129
+++ Makefile 21 Oct 2021 08:50:24 -0000
@@ -1475,7 +1475,6 @@
SUBDIR += py-jmespath
SUBDIR += py-jmespath,python3
SUBDIR += py-jsonrpclib
- SUBDIR += py-jsonschema
SUBDIR += py-jsonschema,python3
SUBDIR += py-jupyter_client,python3
SUBDIR += py-jupyter_core,python3
Index: py-jsonschema/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- py-jsonschema/Makefile 21 May 2021 19:50:26 -0000 1.14
+++ py-jsonschema/Makefile 21 Oct 2021 08:50:24 -0000
@@ -2,10 +2,9 @@
COMMENT = implementation of JSON Schema validation for Python
-MODPY_EGG_VERSION = 2.6.0
+MODPY_EGG_VERSION = 4.1.2
DISTNAME = jsonschema-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 3
CATEGORIES = devel
@@ -21,15 +20,12 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = jsonschema
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
-BUILD_DEPENDS = devel/py-vcversioner${MODPY_FLAVOR}
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS = devel/py-functools32
-.endif
+BUILD_DEPENDS = devel/py-vcversioner${MODPY_FLAVOR} \
+ devel/py-wheel${MODPY_FLAVOR} \
+ devel/py-setuptools_scm${MODPY_FLAVOR} \
+ devel/py-pip${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
-
-post-install:
- mv ${PREFIX}/bin/jsonschema{,${MODPY_BIN_SUFFIX}}
.include <bsd.port.mk>
Index: py-jsonschema/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-jsonschema/distinfo 5 Mar 2017 18:18:24 -0000 1.2
+++ py-jsonschema/distinfo 21 Oct 2021 08:50:24 -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-4.1.2.tar.gz) = XBooLua3QjUFdCH9D3ZqxfKXL3dECSf2RxyehJNjL6w=
+SIZE (jsonschema-4.1.2.tar.gz) = 310016
Index:
py-jsonschema/patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
===================================================================
RCS file:
py-jsonschema/patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
diff -N
py-jsonschema/patches/patch-jsonschema_tests_test_jsonschema_test_suite_py
--- py-jsonschema/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: py-jsonschema/patches/patch-setup_py
===================================================================
RCS file: py-jsonschema/patches/patch-setup_py
diff -N py-jsonschema/patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ py-jsonschema/patches/patch-setup_py 21 Oct 2021 08:50:24 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Provide a minimal setup.py until py-setuptools is updated to allow setup.cfg
+only projects.
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -0,0 +1,2 @@
++from setuptools import setup
++setup(use_scm_version=True)
Index: py-jsonschema/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-jsonschema/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- py-jsonschema/pkg/PLIST 19 Feb 2021 23:13:01 -0000 1.4
+++ py-jsonschema/pkg/PLIST 21 Oct 2021 08:50:24 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2021/02/19 23:13:01 sthen Exp $
+@pkgpath devel/py-jsonschema
@conflict py-jsonschema-<2.6.0p2
-bin/jsonschema${MODPY_BIN_SUFFIX}
+bin/jsonschema
lib/python${MODPY_VERSION}/site-packages/jsonschema/
lib/python${MODPY_VERSION}/site-packages/jsonschema-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/jsonschema-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -15,39 +16,62 @@ ${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/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.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}fuzz_validate.${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_deprecations.${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_utils.${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/fuzz_validate.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_cli.py
+lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_deprecations.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_utils.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/tests/test_validators.py
lib/python${MODPY_VERSION}/site-packages/jsonschema/validators.py
Index: quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1301
diff -u -p -r1.1301 Makefile
--- quirks/Makefile 6 Oct 2021 21:13:29 -0000 1.1301
+++ quirks/Makefile 21 Oct 2021 08:50:24 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-4.54
+PKGNAME = quirks-4.55
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1317
diff -u -p -r1.1317 Quirks.pm
--- quirks/files/Quirks.pm 6 Oct 2021 21:13:29 -0000 1.1317
+++ quirks/files/Quirks.pm 21 Oct 2021 08:50:24 -0000
@@ -496,6 +496,7 @@ my $stem_extensions = {
'py-websocket-client' => 'py3-websocket-client',
'libmesode' => 'libstrophe',
'py-stem' => 'py3-stem',
+ 'py-jsonschema' => 'py3-jsonschema',
};
my $obsolete_reason = {};
