Merge remote-tracking branch 'origin/3.6' into 3.7-alpha0

4 files changed, 33 insertions, 15 deletions

diff --git a/python3-jsonschema/.footprint b/python3-jsonschema/.footprint
index 1ca6500aa..39dd21ecf 100644
--- a/python3-jsonschema/.footprint
+++ b/python3-jsonschema/.footprint
@@ -4,13 +4,13 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-3.2.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema-4.3.3-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__main__.py
@@ -24,8 +24,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/_utils.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/_validators.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/cli.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/compat.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/exceptions.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/protocols.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/__pycache__/validators.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/_format.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/_legacy_validators.py
@@ -42,31 +42,40 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/benchmarks/__py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/benchmarks/issue232.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/benchmarks/json_schema_test_suite.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/cli.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/compat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/exceptions.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/protocols.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft2019-09.json
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft2020-12.json
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft3.json
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft4.json
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft6.json
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/draft7.json
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/schemas/vocabularies.json
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/_helpers.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/_suite.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/fuzz_validate.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_cli.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_deprecations.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_exceptions.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_format.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_jsonschema_test_suite.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_types.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_utils.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/__pycache__/test_validators.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/_helpers.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/_suite.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/fuzz_validate.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_cli.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_deprecations.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_exceptions.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_format.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_jsonschema_test_suite.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_types.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_utils.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/tests/test_validators.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/jsonschema/validators.py
diff --git a/python3-jsonschema/.signature b/python3-jsonschema/.signature
index 3e901717b..670db0fd5 100644
--- a/python3-jsonschema/.signature
+++ b/python3-jsonschema/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30yESssCRxp8KSbe1VqSTJ01T07gnl25AiiPzYi0x810hZ8opwBaSBSM/L/CbxDeZ1qw83xzS+LJpAsTOUinKA8=
-SHA256 (Pkgfile) = f4cd348a3b3075a4fef3a7615a3a6d7234c677e3cbe2ac4560e90bdfeb5f06c9
-SHA256 (.footprint) = ca2cf44b976365f5f82a46feb0296191a7779d1f01aaf6cdbbbe6fd3d1feabaf
-SHA256 (jsonschema-3.2.0.tar.gz) = c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
+RWSagIOpLGJF3y/vyFMjjxX7zaR2LHB94wtd/UgvMrWMaZiDsogXiRJ5efdjAQM6b+7Py49LhtXAdNyi+nBdekQosnRFVXLCSwY=
+SHA256 (Pkgfile) = 8d83610a37a8da5eac8260cdc934ad0894b9b3a2735e14b8eae6ec439107c9d9
+SHA256 (.footprint) = 4461e554a5761880fd8c7338f9073fe6c4958ca0fec55933acad47005bc6d37d
+SHA256 (jsonschema-4.3.3.tar.gz) = f210d4ce095ed1e8af635d15c8ee79b586f656ab54399ba87b8ab87e5bff0ade
+SHA256 (setup.py) = 2bfed10ff42ea8eda7aa38897dd5042f155f837007ccaf73109c1bb51f3e42b9
diff --git a/python3-jsonschema/Pkgfile b/python3-jsonschema/Pkgfile
index 486d12119..8dec467e1 100644
--- a/python3-jsonschema/Pkgfile
+++ b/python3-jsonschema/Pkgfile
@@ -4,12 +4,14 @@
 # Depends on: python3-attrs python3-pyrsistent python3-importlib_metadata
 
 name=python3-jsonschema
-version=3.2.0
+version=4.3.3
 release=1
-source=(https://files.pythonhosted.org/packages/69/11/a69e2a3c01b324a77d3a7c0570faa372e8448b666300c4117a516f8b1212/jsonschema-$version.tar.gz)
+source=(https://pypi.python.org/packages/source/j/jsonschema/jsonschema-$version.tar.gz \
+	setup.py)
 
 build() {
 	cd jsonschema-$version
+	cp $SRC/setup.py .
 	python3 setup.py build
 	python3 setup.py install --root=$PKG
 }
diff --git a/python3-jsonschema/setup.py b/python3-jsonschema/setup.py
new file mode 100644
index 000000000..b4880b7af
--- /dev/null
+++ b/python3-jsonschema/setup.py
@@ -0,0 +1,6 @@
+#/usr/bin/env python3
+
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup()