Merge branch 'master' into docs/add-v0.7.0-release-notes

Author: kratsg

setup.cfg

@@ -38,10 +38,10 @@ install_requires =
     scipy>=1.1.0 # requires numpy, which is required by pyhf and tensorflow
     click>=8.0.0  # for console scripts
     tqdm>=4.56.0  # for readxml
-    jsonschema>=3.0.0  # for utils
+    jsonschema>=4.15.0  # for utils
     jsonpatch>=1.15
     pyyaml>=5.1  # for parsing CLI equal-delimited options
-    importlib_resources>=1.3.0; python_version < "3.9"  # for resources in schema
+    importlib_resources>=1.4.0; python_version < "3.9"  # for resources in schema
     typing_extensions>=3.7.4.3; python_version == "3.7"  # for SupportsIndex
 
 [options.packages.find]

src/pyhf/schema/validator.py

@@ -27,8 +27,8 @@ def validate(spec: Mapping, schema_name: str, version: Union[str, None] = None):
 
     # note: trailing slash needed for RefResolver to resolve correctly
     resolver = jsonschema.RefResolver(
-        base_uri=f"file://{variables.schemas}/",
-        referrer=f"{version}/{schema_name}",
+        base_uri=f"file://{variables.schemas}/{version}/",
+        referrer=f"{schema_name}",
         store=variables.SCHEMA_CACHE,
     )
     validator = jsonschema.Draft6Validator(

tests/constraints.txt

@@ -2,10 +2,10 @@
 scipy==1.1.0
 click==8.0.0  # c.f. PR #1958, #1909
 tqdm==4.56.0
-jsonschema==3.0.0
+jsonschema==4.15.0  # c.f. PR #1979
 jsonpatch==1.15
 pyyaml==5.1
-importlib_resources==1.3.0
+importlib_resources==1.4.0  # c.f. PR #1979
 typing-extensions==3.7.4.3  # c.f. PR #1961, #1940
 # xmlio
 uproot==4.1.1