diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cf630c3e3..0f14f3c1e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: py: "3.9" runs-on: ubuntu-latest - name: "Run '${{ matrix.toxenv }}' on python ${{ matrix.py }}" + name: "'${{ matrix.toxenv }}' on py${{ matrix.py }}" steps: - uses: actions/checkout@v4 @@ -61,10 +61,10 @@ jobs: ci-test-matrix: strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu, windows, macos] py: ['3.9', '3.10', '3.11', '3.12', '3.13'] - name: "Run tests on ${{ matrix.os }}, py${{ matrix.py }}" - runs-on: ${{ matrix.os }} + name: "Test on ${{ matrix.os }}, py${{ matrix.py }}" + runs-on: "${{ matrix.os }}-latest" steps: - uses: actions/checkout@v4 @@ -98,7 +98,7 @@ jobs: - name: test run: | python -m tox run -m ci -- --junitxml pytest.{envname}.xml - python -m tox run -e cov + python -m tox run -e cov_combine,cov_report - uses: actions/upload-artifact@v4 with: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2cb7de293..56bd27220 100644 --- 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.31.1 + rev: 0.31.2 hooks: - id: check-dependabot - id: check-github-workflows @@ -36,11 +36,11 @@ repos: - 'flake8-typing-as-t==0.0.3' - 'flake8-comprehensions==3.15.0' - repo: https://github.com/sirosen/slyp - rev: 0.8.1 + rev: 0.8.2 hooks: - id: slyp - repo: https://github.com/PyCQA/isort - rev: 6.0.0 + rev: 6.0.1 hooks: - id: isort - repo: https://github.com/asottile/pyupgrade diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 04cc5629f..0d020d381 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,12 @@ Unreleased .. vendor-insert-here +0.31.3 +------ + +- Update vendored schemas: circle-ci, github-workflows, mergify, renovate, taskfile + (2025-03-07) + 0.31.2 ------ diff --git a/README.md b/README.md index ecc10916d..98754e8a7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ files. ```yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-github-workflows args: ["--verbose"] diff --git a/docs/optional_parsers.rst b/docs/optional_parsers.rst index d0e89f1bc..8f8610c59 100644 --- a/docs/optional_parsers.rst +++ b/docs/optional_parsers.rst @@ -20,7 +20,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-renovate additional_dependencies: ['pyjson5'] @@ -45,7 +45,7 @@ For example, .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-jsonschema name: 'Check GitHub Workflows' diff --git a/docs/precommit_usage.rst b/docs/precommit_usage.rst index aa595af7b..36d5693e4 100644 --- a/docs/precommit_usage.rst +++ b/docs/precommit_usage.rst @@ -17,7 +17,7 @@ You must specify a schema using pre-commit ``args`` configuration. :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-jsonschema files: ^data/.*\.json$ @@ -34,7 +34,7 @@ Validate JSON Schema files against their matching metaschema, as specified in th :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-metaschema files: ^schemas/.*\.json$ @@ -52,7 +52,7 @@ Validate Azure Pipelines config against the schema provided by Microsoft :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-azure-pipelines @@ -66,7 +66,7 @@ Validate Bamboo Specs against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-bamboo-spec @@ -80,7 +80,7 @@ Validate Bitbucket Pipelines against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-bitbucket-pipelines @@ -94,7 +94,7 @@ Validate Buildkite Pipelines against the schema provided by Buildkite :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-buildkite @@ -108,7 +108,7 @@ Validate CircleCI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-circle-ci @@ -122,7 +122,7 @@ Validate Google Cloud Build config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-cloudbuild @@ -136,7 +136,7 @@ Validate Docker Compose files against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-compose-spec @@ -150,7 +150,7 @@ Validate Dependabot Config (v2) against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-dependabot @@ -164,7 +164,7 @@ Validate Drone-CI Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-drone-ci @@ -178,7 +178,7 @@ Validate GitHub Actions against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-github-actions @@ -192,7 +192,7 @@ Validate GitHub Workflows against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-github-workflows @@ -206,7 +206,7 @@ Validate GitLab CI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-gitlab-ci @@ -220,7 +220,7 @@ Validate Mergify config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-mergify @@ -234,7 +234,7 @@ Validate ReadTheDocs config against the schema provided by ReadTheDocs :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-readthedocs @@ -248,7 +248,7 @@ Validate Renovate config against the schema provided by Renovate (does not suppo :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-renovate @@ -262,7 +262,7 @@ Validate Taskfile config against the schema provided by Task :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-taskfile @@ -276,7 +276,7 @@ Validate Travis Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-travis @@ -290,7 +290,7 @@ Validate Woodpecker Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-woodpecker-ci @@ -316,7 +316,7 @@ manually, you could do this: .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-jsonschema name: "Check GitHub Workflows" @@ -335,7 +335,7 @@ To check with the builtin schema that a GitHub workflow sets .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.2 + rev: 0.31.3 hooks: - id: check-jsonschema name: "Check GitHub Workflows set timeout-minutes" diff --git a/pyproject.toml b/pyproject.toml index 54349b0da..a6bbf7bd7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "check-jsonschema" -version = "0.31.2" +version = "0.31.3" description = "A jsonschema CLI and pre-commit hook" authors = [ { name = "Stephen Rosen", email = "sirosen0@gmail.com" }, diff --git a/scripts/vendor-schemas.py b/scripts/vendor-schemas.py index 4d81ddd37..36e5ea966 100644 --- a/scripts/vendor-schemas.py +++ b/scripts/vendor-schemas.py @@ -19,7 +19,7 @@ EXISTING_CHANGELINE_PATTERN = re.compile( re.escape(VENDOR_SLUG) + "\n?- Update vendored schemas: " - + r"([\w-]+(,\s+[\w-]+)*) " + + r"([\w-]+(,\s+[\w-]+)*)\s+" + r"\(\d{4}-\d{2}-\d{2}\)" + "\n", flags=re.MULTILINE, diff --git a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json index 2f54c3f0d..01e68da80 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/circle-ci.json @@ -1321,6 +1321,8 @@ "ubuntu-2404:2024.05.1", "ubuntu-2404:current", "ubuntu-2404:edge", + "android:2024.11.1", + "android:2024.07.1", "android:2024.04.1", "android:2024.01.1", "android:2023.11.1", @@ -1425,7 +1427,12 @@ "macOSResourceClass": { "description": "Amount of CPU and RAM allocated for each job. View [available resource classes](https://circleci.com/docs/configuration-reference/#macos-execution-environment).", "type": "string", - "enum": ["macos.m1.medium.gen1", "macos.m1.large.gen1"] + "enum": [ + "macos.m1.medium.gen1", + "macos.m1.large.gen1", + "m2pro.medium", + "m2pro.large" + ] }, "xcodeVersion": { "description": "The version of Xcode to use. View [available versions](https://circleci.com/developer/machine/image/xcode)", diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json index de4dcd891..d1dbfe1fe 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json +++ b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json @@ -843,6 +843,131 @@ }, "required": ["runs-on"], "additionalProperties": false + }, + "workflowDispatchInput": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id", + "description": "A string identifier to associate with the input. The value of is a map of the input's metadata. The must be a unique identifier within the inputs object. The must start with a letter or _ and contain only alphanumeric characters, -, or _.", + "type": "object", + "properties": { + "description": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription", + "description": "A string description of the input parameter.", + "type": "string" + }, + "deprecationMessage": { + "description": "A string shown to users using the deprecated input.", + "type": "string" + }, + "required": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired", + "description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.", + "type": "boolean" + }, + "default": { + "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault", + "description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file." + }, + "type": { + "$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype", + "description": "A string representing the type of the input.", + "type": "string", + "enum": ["string", "choice", "boolean", "number", "environment"] + }, + "options": { + "$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows", + "description": "The options of the dropdown list, if the type is a choice.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 1 + } + }, + "allOf": [ + { + "if": { + "properties": { + "type": { + "const": "string" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "string" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "boolean" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "boolean" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "number" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "number" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "environment" + } + }, + "required": ["type"] + }, + "then": { + "properties": { + "default": { + "type": "string" + } + } + } + }, + { + "if": { + "properties": { + "type": { + "const": "choice" + } + }, + "required": ["type"] + }, + "then": { + "required": ["options"] + } + } + ], + "required": ["description"], + "additionalProperties": false } }, "properties": { @@ -1469,135 +1594,7 @@ "type": "object", "patternProperties": { "^[_a-zA-Z][a-zA-Z0-9_-]*$": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_id", - "description": "A string identifier to associate with the input. The value of is a map of the input's metadata. The must be a unique identifier within the inputs object. The must start with a letter or _ and contain only alphanumeric characters, -, or _.", - "type": "object", - "properties": { - "description": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddescription", - "description": "A string description of the input parameter.", - "type": "string" - }, - "deprecationMessage": { - "description": "A string shown to users using the deprecated input.", - "type": "string" - }, - "required": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_idrequired", - "description": "A boolean to indicate whether the action requires the input parameter. Set to true when the parameter is required.", - "type": "boolean" - }, - "default": { - "$comment": "https://help.github.com/en/github/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#inputsinput_iddefault", - "description": "A string representing the default value. The default value is used when an input parameter isn't specified in a workflow file." - }, - "type": { - "$comment": "https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatchinputsinput_idtype", - "description": "A string representing the type of the input.", - "type": "string", - "enum": [ - "string", - "choice", - "boolean", - "number", - "environment" - ] - }, - "options": { - "$comment": "https://github.blog/changelog/2021-11-10-github-actions-input-types-for-manual-workflows", - "description": "The options of the dropdown list, if the type is a choice.", - "type": "array", - "items": { - "type": "string" - }, - "minItems": 1 - } - }, - "allOf": [ - { - "if": { - "properties": { - "type": { - "const": "string" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "string" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "boolean" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "boolean" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "number" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "number" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "environment" - } - }, - "required": ["type"] - }, - "then": { - "properties": { - "default": { - "type": "string" - } - } - } - }, - { - "if": { - "properties": { - "type": { - "const": "choice" - } - }, - "required": ["type"] - }, - "then": { - "required": ["options"] - } - } - ], - "required": ["description"], - "additionalProperties": false + "$ref": "#/definitions/workflowDispatchInput" } }, "additionalProperties": false diff --git a/src/check_jsonschema/builtin_schemas/vendor/mergify.json b/src/check_jsonschema/builtin_schemas/vendor/mergify.json index f3d423400..42f9a3337 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/mergify.json +++ b/src/check_jsonschema/builtin_schemas/vendor/mergify.json @@ -347,7 +347,7 @@ "default": [ "check" ], - "description": "List of reporting modes for the action's result.", + "description": "Reporting modes for the action's result. Check will create a check on the pull request, and comment will post a comment on the pull request.", "items": { "enum": [ "check", @@ -812,7 +812,7 @@ "default": [ "check" ], - "description": "List of reporting modes for the action's result.", + "description": "Reporting modes for the action's result. Check will create a check on the pull request, and comment will post a comment on the pull request.", "items": { "enum": [ "check", @@ -1284,6 +1284,23 @@ "title": "MergeProtectionRulesModel", "type": "array" }, + "MergeProtectionsModel": { + "additionalProperties": false, + "properties": { + "reporting_method": { + "default": "check-runs", + "description": "The merge protection reporting method", + "enum": [ + "check-runs", + "deployments" + ], + "title": "Reporting Method", + "type": "string" + } + }, + "title": "MergeProtectionsModel", + "type": "object" + }, "MergeQueueModel": { "additionalProperties": false, "properties": { @@ -1689,7 +1706,8 @@ "PULL_REQUEST_UPDATED", "MERGE_QUEUE_RESET", "INCOMPATIBILITY_WITH_BRANCH_PROTECTIONS", - "PR_MANUALLY_MERGED" + "PR_MANUALLY_MERGED", + "DRAFT_PULL_REQUEST_CREATION_FAILED" ], "type": "string" }, @@ -2615,6 +2633,11 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { + "configuration_deprecated_attribute": { + "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/", + "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/" + }, + "deprecated": true, "items": { "type": "string" }, @@ -2847,6 +2870,11 @@ "title": "Update Bot Account" }, "disallow_checks_interruption_from_queues": { + "configuration_deprecated_attribute": { + "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/", + "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `disallow_checks_interruption_from_queues` attribute in the `queue_rules` section. It has been replaced in favor of using `priority_rules` at the top-level of the configuration.\n> For more information: https://docs.mergify.com/merge-queue/priority/" + }, + "deprecated": true, "items": { "type": "string" }, @@ -3163,6 +3191,9 @@ }, "merge_queue": { "$ref": "#/$defs/MergeQueueModel" + }, + "merge_protections_settings": { + "$ref": "#/$defs/MergeProtectionsModel" } }, "$schema": "https://json-schema.org/draft/2020-12/schema", diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 02a250639..01a73e5d7 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -885,6 +885,7 @@ "type": "string", "enum": [ "json", + "toml", "yaml" ] }, @@ -1090,7 +1091,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:13.7.2" + "default": "ghcr.io/containerbase/sidecar:13.8.4" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -3045,6 +3046,15 @@ "description": "Path to the Server-side old private key.", "type": "string" }, + "processEnv": { + "description": "Environment variables to be used in global config only.", + "type": "object", + "default": {}, + "additionalProperties": { + "type": "string" + }, + "$ref": "#" + }, "productLinks": { "description": "Links which are used in PRs, issues and comments.", "type": "object", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 index 557aa8af6..32be41c77 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/circle-ci.sha256 @@ -1 +1 @@ -cd652ef789d666c07f2fd5e6236ae2a491e11506addb42466f6c9911fa997955 \ No newline at end of file +07533ac8ed37edd4ee71bc39daecd03c5ee88619732e7dc24cf7627a272d9cd1 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 index 9ffe1c1eb..ab9433a9c 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 @@ -1 +1 @@ -a4e9db7fb53cb6dd91b3c71449b98f42d8e778ebf6cf1bd1b8c3224f3dce8bee \ No newline at end of file +287c4e34b14a32340166605a8b98846409f9177234d1f308263834a31b7692e7 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 index e30957b15..431745e84 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/mergify.sha256 @@ -1 +1 @@ -a5a886702e1102c86a72bcc676f5da57d697718a91f7ab529a9ac17def47c6b7 \ No newline at end of file +fdab26935842c3462745512106824a5aca147f86d15b7accc9e49c81dbc4bc5a \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 index ea770b404..f0cca0b40 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -b927d2478e21f6bc423771ad88943933c9b6af2421dc29de4b247c93f0ec9555 \ No newline at end of file +6cd4ba56fbd2a370764ad0dda37fcdd0dee0f6d7fd08674b2c50f4c103fb38f9 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 index ba28a1442..31e0bca03 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 @@ -1 +1 @@ -e991e9f53f0615caf16c0777d9f38e5aa8243407283205110f3514d1375097ff \ No newline at end of file +4ed69fa81667b77ee5e0146080dd73b376ee88ea5dd23e743644a495c7f35c80 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json index da25a209f..a44df7a8d 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/taskfile.json +++ b/src/check_jsonschema/builtin_schemas/vendor/taskfile.json @@ -29,6 +29,12 @@ }, { "$ref": "#/definitions/task_call" + }, + { + "$ref": "#/definitions/defer_task_call" + }, + { + "$ref": "#/definitions/defer_cmd_call" } ] } @@ -216,7 +222,10 @@ "$ref": "#/definitions/task_call" }, { - "$ref": "#/definitions/defer_call" + "$ref": "#/definitions/defer_task_call" + }, + { + "$ref": "#/definitions/defer_cmd_call" }, { "$ref": "#/definitions/for_cmds_call" @@ -350,15 +359,12 @@ "additionalProperties": false, "required": ["cmd"] }, - "defer_call": { + "defer_task_call": { "type": "object", "properties": { "defer": { "description": "Run a command when the task completes. This command will run even when the task fails", "anyOf": [ - { - "type": "string" - }, { "$ref": "#/definitions/task_call" } @@ -368,6 +374,21 @@ "additionalProperties": false, "required": ["defer"] }, + "defer_cmd_call": { + "type": "object", + "properties": { + "defer": { + "description": "Name of the command to defer", + "type": "string" + }, + "silent": { + "description": "Hides task name and command from output. The command's output will still be redirected to `STDOUT` and `STDERR`.", + "type": "boolean" + } + }, + "additionalProperties": false, + "required": ["defer"] + }, "for_cmds_call": { "type": "object", "properties": { diff --git a/src/check_jsonschema/catalog.py b/src/check_jsonschema/catalog.py index 0bedd57a1..dcbcf3c58 100644 --- a/src/check_jsonschema/catalog.py +++ b/src/check_jsonschema/catalog.py @@ -182,7 +182,7 @@ def _githubusercontent_url(owner: str, repo: str, ref: str, path: str) -> str: "url": _githubusercontent_url( "readthedocs", "readthedocs.org", - "master", + "main", "readthedocs/rtd_tests/fixtures/spec/v2/schema.json", ), "hook_config": { diff --git a/tox.ini b/tox.ini index 6edec916f..115d46171 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,8 @@ envlist = py{313,312,311,310,39} py{39,313}-{json5,pyjson5}{,-format} py{39,313}-{disable_orjson} - cov + cov_combine + cov_report skip_missing_interpreters = true minversion = 4.0.0 @@ -39,13 +40,19 @@ skip_install = true commands = coverage erase depends = -[testenv:cov] -description = "combine and report coverage data" +[testenv:cov_combine] +description = "combine coverage data" +deps = coverage +skip_install = true +commands = coverage combine +depends = py{,38,39,310,311,312,313}{,-mindeps,-format,-json5,-pyjson5,-disable_orjson} + +[testenv:cov_report] +description = "report test coverage" deps = coverage skip_install = true -commands_pre = - coverage combine commands = coverage report --skip-covered -depends = py{,38,39,310,311,312}{,-mindeps,-format,-json5,-pyjson5,-disable_orjson} +depends = cov_combine [testenv:mypy] description = "check type annotations with mypy"