Update vendored schemas and pre-commit config

sirosen · sirosen · commit 01e8782b375b · 2023-08-25T22:55:55.000-05:00
Due to a flake8-bugbear update, also tweak some usages to pass
linting.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 repos:
 # dogfood
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.24.1
+  rev: 0.26.0
   hooks:
     - id: check-dependabot
     - id: check-github-workflows
@@ -26,7 +26,7 @@ repos:
   rev: 6.1.0
   hooks:
     - id: flake8
-      additional_dependencies: ['flake8-bugbear==22.7.1']
+      additional_dependencies: ['flake8-bugbear==23.7.10']
 - repo: https://github.com/PyCQA/isort
   rev: 5.12.0
   hooks:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,8 @@ Unreleased
 
 .. vendor-insert-here
 
+- Update vendored schemas: github-workflows, renovate (2023-08-25)
+
 0.26.0
 ------
 - The regex format check has been improved to support ECMAScript regexes by
diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json
@@ -419,6 +419,53 @@
         }
       ]
     },
+    "matrix": {
+      "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix",
+      "description": "A build matrix is a set of different configurations of the virtual environment. For example you might run a job against more than one supported version of a language, operating system, or tool. Each configuration is a copy of the job that runs and reports a status.\nYou can specify a matrix by supplying an array for the configuration options. For example, if the GitHub virtual environment supports Node.js versions 6, 8, and 10 you could specify an array of those versions in the matrix.\nWhen you define a matrix of operating systems, you must set the required runs-on keyword to the operating system of the current job, rather than hard-coding the operating system name. To access the operating system name, you can use the matrix.os context parameter to set runs-on. For more information, see https://help.github.com/en/articles/contexts-and-expression-syntax-for-github-actions.",
+      "oneOf": [
+        {
+          "type": "object"
+        },
+        {
+          "$ref": "#/definitions/expressionSyntax"
+        }
+      ],
+      "patternProperties": {
+        "^(in|ex)clude$": {
+          "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#example-including-configurations-in-a-matrix-build",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/expressionSyntax"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "additionalProperties": {
+                  "$ref": "#/definitions/configuration"
+                }
+              },
+              "minItems": 1
+            }
+          ]
+        }
+      },
+      "additionalProperties": {
+        "oneOf": [
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/configuration"
+            },
+            "minItems": 1
+          },
+          {
+            "$ref": "#/definitions/expressionSyntax"
+          }
+        ]
+      },
+      "minProperties": 1
+    },
     "reusableWorkflowCallJob": {
       "$comment": "https://docs.github.com/en/actions/learn-github-actions/reusing-workflows#calling-a-reusable-workflow",
       "description": "Each job must have an id to associate with the job. The key job_id is a string and its value is a map of the job's configuration data. You must replace <job_id> with a string that is unique to the jobs object. The <job_id> must start with a letter or _ and contain only alphanumeric characters, -, or _.",
@@ -470,44 +517,7 @@
           "type": "object",
           "properties": {
             "matrix": {
-              "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix",
-              "description": "A build matrix is a set of different configurations of the virtual environment. For example you might run a job against more than one supported version of a language, operating system, or tool. Each configuration is a copy of the job that runs and reports a status.\nYou can specify a matrix by supplying an array for the configuration options. For example, if the GitHub virtual environment supports Node.js versions 6, 8, and 10 you could specify an array of those versions in the matrix.\nWhen you define a matrix of operating systems, you must set the required runs-on keyword to the operating system of the current job, rather than hard-coding the operating system name. To access the operating system name, you can use the matrix.os context parameter to set runs-on. For more information, see https://help.github.com/en/articles/contexts-and-expression-syntax-for-github-actions.",
-              "oneOf": [
-                {
-                  "type": "object"
-                },
-                {
-                  "$ref": "#/definitions/expressionSyntax"
-                }
-              ],
-              "patternProperties": {
-                "^(in|ex)clude$": {
-                  "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#example-including-configurations-in-a-matrix-build",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "$ref": "#/definitions/configuration"
-                    }
-                  },
-                  "minItems": 1
-                }
-              },
-              "additionalProperties": {
-                "oneOf": [
-                  {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/definitions/configuration"
-                    },
-                    "minItems": 1
-                  },
-                  {
-                    "$ref": "#/definitions/expressionSyntax"
-                  }
-                ]
-              },
-              "minProperties": 1
+              "$ref": "#/definitions/matrix"
             },
             "fail-fast": {
               "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast",
@@ -889,44 +899,7 @@
           "type": "object",
           "properties": {
             "matrix": {
-              "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix",
-              "description": "A build matrix is a set of different configurations of the virtual environment. For example you might run a job against more than one supported version of a language, operating system, or tool. Each configuration is a copy of the job that runs and reports a status.\nYou can specify a matrix by supplying an array for the configuration options. For example, if the GitHub virtual environment supports Node.js versions 6, 8, and 10 you could specify an array of those versions in the matrix.\nWhen you define a matrix of operating systems, you must set the required runs-on keyword to the operating system of the current job, rather than hard-coding the operating system name. To access the operating system name, you can use the matrix.os context parameter to set runs-on. For more information, see https://help.github.com/en/articles/contexts-and-expression-syntax-for-github-actions.",
-              "oneOf": [
-                {
-                  "type": "object"
-                },
-                {
-                  "$ref": "#/definitions/expressionSyntax"
-                }
-              ],
-              "patternProperties": {
-                "^(in|ex)clude$": {
-                  "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#example-including-configurations-in-a-matrix-build",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "$ref": "#/definitions/configuration"
-                    }
-                  },
-                  "minItems": 1
-                }
-              },
-              "additionalProperties": {
-                "oneOf": [
-                  {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/definitions/configuration"
-                    },
-                    "minItems": 1
-                  },
-                  {
-                    "$ref": "#/definitions/expressionSyntax"
-                  }
-                ]
-              },
-              "minProperties": 1
+              "$ref": "#/definitions/matrix"
             },
             "fail-fast": {
               "$comment": "https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstrategyfail-fast",
diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256
@@ -1 +1 @@
-7c009ac488bfd9315bcdb66e2462c13caa8bcb30ad2de7adeb7c05cbc129698c
+555a0121150e7241672f6496c568ccc317a06fcf5115ab248a0351aeb1cba65a
diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json
@@ -393,6 +393,12 @@
       "type": "integer",
       "default": 1440
     },
+    "cacheTtlOverride": {
+      "description": "An object that contains cache namespace TTL override values",
+      "type": "object",
+      "default": {},
+      "$ref": "#"
+    },
     "cake": {
       "description": "Configuration object for the cake manager",
       "type": "object",
@@ -768,7 +774,7 @@
     "dockerSidecarImage": {
       "description": "Change this value to override the default Renovate sidecar image.",
       "type": "string",
-      "default": "ghcr.io/containerbase/sidecar:9.17.3"
+      "default": "ghcr.io/containerbase/sidecar:9.19.0"
     },
     "dockerUser": {
       "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.",
diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256
@@ -1 +1 @@
-9d5809dff3355cad4972c046c07f42553e154ee8c5f1f72b41dde6aec15eb6b6
+f0799b37b14031aa00e8648fafdecbcb4c88c3b90c3925ea230f7badea85b01a
diff --git a/src/check_jsonschema/cli/warnings.py b/src/check_jsonschema/cli/warnings.py
@@ -18,7 +18,7 @@ def callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> t.Any:
             )
             if append_message is not None:
                 message += f" {append_message}"
-            warnings.warn(message)
+            warnings.warn(message, stacklevel=2)
 
         return value
 
diff --git a/tests/unit/test_gitlab_data_transform.py b/tests/unit/test_gitlab_data_transform.py
@@ -1,6 +1,6 @@
 import pytest
 
-from check_jsonschema.parsers.yaml import construct_yaml_implementation
+from check_jsonschema.parsers.yaml import ParseError, construct_yaml_implementation
 from check_jsonschema.transforms.gitlab import (
     GITLAB_TRANSFORM,
     GitLabReferenceExpectationViolation,
@@ -30,7 +30,7 @@ def test_can_parse_ok_gitlab_yaml_with_transform():
 """
     impl = construct_yaml_implementation()
 
-    with pytest.raises(Exception):
+    with pytest.raises(ParseError):
         data = impl.load(rawdata)
 
     GITLAB_TRANSFORM.modify_yaml_implementation(impl)
@@ -45,7 +45,7 @@ def test_cannot_parse_bad_gitlab_yaml_with_transform():
 """
     impl = construct_yaml_implementation()
 
-    with pytest.raises(Exception):
+    with pytest.raises(ParseError):
         impl.load(rawdata)
 
     GITLAB_TRANSFORM.modify_yaml_implementation(impl)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-7c009ac488bfd9315bcdb66e2462c13caa8bcb30ad2de7adeb7c05cbc129698c`
	`1`	`+555a0121150e7241672f6496c568ccc317a06fcf5115ab248a0351aeb1cba65a`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-9d5809dff3355cad4972c046c07f42553e154ee8c5f1f72b41dde6aec15eb6b6`
	`1`	`+f0799b37b14031aa00e8648fafdecbcb4c88c3b90c3925ea230f7badea85b01a`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ def callback(ctx: click.Context, param: click.Parameter, value: t.Any) -> t.Any:`
`18`	`18`	`)`
`19`	`19`	`if append_message is not None:`
`20`	`20`	`message += f" {append_message}"`
`21`		`- warnings.warn(message)`
	`21`	`+ warnings.warn(message, stacklevel=2)`
`22`	`22`
`23`	`23`	`return value`
`24`	`24`