summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2021-12-19 11:02:33 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2021-12-19 12:55:42 -0800
commitbfc69f0e4b1af1b421068715dcd68f134e713231 (patch)
tree0efe751a3dd58520b5a79b4c95cbb0cfd84de9c2
parent77030431955b997d8325e477d9b18803fd74e31a (diff)
downloadspack-bfc69f0e4b1af1b421068715dcd68f134e713231.tar.gz
spack-bfc69f0e4b1af1b421068715dcd68f134e713231.tar.bz2
spack-bfc69f0e4b1af1b421068715dcd68f134e713231.tar.xz
spack-bfc69f0e4b1af1b421068715dcd68f134e713231.zip
jsonschema: use more specific schema identifiers
The latest version of `jsonschema` fails if we're not specific about which schema draft specification we're using. Update all of them to use the latest one (draft-07).
Diffstat
-rw-r--r--lib/spack/spack/schema/bootstrap.py2
-rw-r--r--lib/spack/spack/schema/buildcache_spec.py2
-rw-r--r--lib/spack/spack/schema/cdash.py2
-rw-r--r--lib/spack/spack/schema/compilers.py2
-rw-r--r--lib/spack/spack/schema/config.py2
-rw-r--r--lib/spack/spack/schema/database_index.py2
-rw-r--r--lib/spack/spack/schema/env.py2
-rw-r--r--lib/spack/spack/schema/gitlab_ci.py2
-rw-r--r--lib/spack/spack/schema/merged.py2
-rw-r--r--lib/spack/spack/schema/mirrors.py2
-rw-r--r--lib/spack/spack/schema/modules.py2
-rw-r--r--lib/spack/spack/schema/packages.py2
-rw-r--r--lib/spack/spack/schema/projections.py2
-rw-r--r--lib/spack/spack/schema/repos.py2
-rw-r--r--lib/spack/spack/schema/spec.py2
-rw-r--r--lib/spack/spack/schema/upstreams.py2
16 files changed, 16 insertions, 16 deletions
diff --git a/lib/spack/spack/schema/bootstrap.py b/lib/spack/spack/schema/bootstrap.py
index bd3c6630fb..e77001e854 100644
--- a/lib/spack/spack/schema/bootstrap.py
+++ b/lib/spack/spack/schema/bootstrap.py
@@ -39,7 +39,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack bootstrap configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/buildcache_spec.py b/lib/spack/spack/schema/buildcache_spec.py
index 563235c311..a72c70a59c 100644
--- a/lib/spack/spack/schema/buildcache_spec.py
+++ b/lib/spack/spack/schema/buildcache_spec.py
@@ -11,7 +11,7 @@
import spack.schema.spec
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack buildcache specfile schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/cdash.py b/lib/spack/spack/schema/cdash.py
index 41c0146b1d..b236159629 100644
--- a/lib/spack/spack/schema/cdash.py
+++ b/lib/spack/spack/schema/cdash.py
@@ -28,7 +28,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack cdash configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/compilers.py b/lib/spack/spack/schema/compilers.py
index 91ace05f4e..df32036491 100644
--- a/lib/spack/spack/schema/compilers.py
+++ b/lib/spack/spack/schema/compilers.py
@@ -84,7 +84,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack compiler configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py
index 0cf533eb18..801c6d5ea5 100644
--- a/lib/spack/spack/schema/config.py
+++ b/lib/spack/spack/schema/config.py
@@ -110,7 +110,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack core configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/database_index.py b/lib/spack/spack/schema/database_index.py
index 105f6ad6a3..7a6143d555 100644
--- a/lib/spack/spack/schema/database_index.py
+++ b/lib/spack/spack/schema/database_index.py
@@ -14,7 +14,7 @@ import spack.schema.spec
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack spec schema',
'type': 'object',
'required': ['database'],
diff --git a/lib/spack/spack/schema/env.py b/lib/spack/spack/schema/env.py
index de6a5d9568..5a9bfe9aa1 100644
--- a/lib/spack/spack/schema/env.py
+++ b/lib/spack/spack/schema/env.py
@@ -52,7 +52,7 @@ spec_list_schema = {
projections_scheme = spack.schema.projections.properties['projections']
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack environment file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/gitlab_ci.py b/lib/spack/spack/schema/gitlab_ci.py
index d6d8f564a3..4e5abe397b 100644
--- a/lib/spack/spack/schema/gitlab_ci.py
+++ b/lib/spack/spack/schema/gitlab_ci.py
@@ -153,7 +153,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack gitlab-ci configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/merged.py b/lib/spack/spack/schema/merged.py
index 11db4f78df..bbc288cb7a 100644
--- a/lib/spack/spack/schema/merged.py
+++ b/lib/spack/spack/schema/merged.py
@@ -40,7 +40,7 @@ properties = union_dicts(
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack merged configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/mirrors.py b/lib/spack/spack/schema/mirrors.py
index 5e66f9306c..38cb126d6c 100644
--- a/lib/spack/spack/schema/mirrors.py
+++ b/lib/spack/spack/schema/mirrors.py
@@ -37,7 +37,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack mirror configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py
index 90755f5588..4b30ae582f 100644
--- a/lib/spack/spack/schema/modules.py
+++ b/lib/spack/spack/schema/modules.py
@@ -219,7 +219,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack module file configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py
index 86aabc6649..55ed1bbf3b 100644
--- a/lib/spack/spack/schema/packages.py
+++ b/lib/spack/spack/schema/packages.py
@@ -154,7 +154,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack package configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/projections.py b/lib/spack/spack/schema/projections.py
index cab512fe3b..7623a5be6d 100644
--- a/lib/spack/spack/schema/projections.py
+++ b/lib/spack/spack/schema/projections.py
@@ -25,7 +25,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack view projection configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/repos.py b/lib/spack/spack/schema/repos.py
index 44cf688a48..d16c1b07bd 100644
--- a/lib/spack/spack/schema/repos.py
+++ b/lib/spack/spack/schema/repos.py
@@ -22,7 +22,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack repository configuration file schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/spec.py b/lib/spack/spack/schema/spec.py
index 3dd84553f7..5d2618bd80 100644
--- a/lib/spack/spack/schema/spec.py
+++ b/lib/spack/spack/schema/spec.py
@@ -192,7 +192,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack spec schema',
'type': 'object',
'additionalProperties': False,
diff --git a/lib/spack/spack/schema/upstreams.py b/lib/spack/spack/schema/upstreams.py
index 7d721332eb..5075059d58 100644
--- a/lib/spack/spack/schema/upstreams.py
+++ b/lib/spack/spack/schema/upstreams.py
@@ -31,7 +31,7 @@ properties = {
#: Full schema with metadata
schema = {
- '$schema': 'http://json-schema.org/schema#',
+ '$schema': 'http://json-schema.org/draft-07/schema#',
'title': 'Spack core configuration file schema',
'type': 'object',
'additionalProperties': False,
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-26 07:36:20 +0000