From c2dbb1be3a10e1da74aad7add81d8d8a4e9d570c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 19:43:00 +0000 Subject: [PATCH 01/17] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks.git: v4.5.0 → v4.6.0](https://github.com/pre-commit/pre-commit-hooks.git/compare/v4.5.0...v4.6.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 00059c8e4..228f9c030 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: ["--schemafile", "tests/example-files/config_schema.json"] files: ^tests/example-files/.*/_config.yaml$ - repo: https://github.com/pre-commit/pre-commit-hooks.git - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-merge-conflict - id: trailing-whitespace From 2bdec5d3f1a6d4791b718850fc7765e166c6ee67 Mon Sep 17 00:00:00 2001 From: sirosen <1300022+sirosen@users.noreply.github.com> Date: Sun, 14 Apr 2024 04:43:42 +0000 Subject: [PATCH 02/17] [vendor-schemas] automated update --- CHANGELOG.rst | 2 ++ .../builtin_schemas/vendor/github-workflows.json | 4 +--- .../builtin_schemas/vendor/github-workflows.sha256 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2834aae60..94510efe5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,8 @@ Unreleased .. vendor-insert-here +- Update vendored schemas (2024-04-14) + 0.28.2 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json index 2ec2273f7..93d3df0da 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json +++ b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.json @@ -1651,9 +1651,7 @@ "items": { "properties": { "cron": { - "$comment": "https://stackoverflow.com/a/57639657/4044345", - "type": "string", - "pattern": "^(((\\d+,)+\\d+|((\\d+|\\*)/\\d+|((JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(-(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?))|(\\d+-\\d+)|\\d+(-\\d+)?/\\d+(-\\d+)?|\\d+|\\*|(MON|TUE|WED|THU|FRI|SAT|SUN)(-(MON|TUE|WED|THU|FRI|SAT|SUN))?) ?){5}$" + "type": "string" } }, "additionalProperties": false diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 index 46a5f00ae..3a4fbbd45 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 @@ -1 +1 @@ -da2748265fa3d36d0cdb89401bdc2748e940fa421e11a6d00d5040d41c01ab38 \ No newline at end of file +1b24b33d22188a8b4f3f353c38ffed01e45128b849c2329f5e2caa6550684513 \ No newline at end of file From b0fbeaf43478a38dc87f4fd2f8e1e643cd2e3edf Mon Sep 17 00:00:00 2001 From: sirosen <1300022+sirosen@users.noreply.github.com> Date: Sun, 21 Apr 2024 04:24:46 +0000 Subject: [PATCH 03/17] [vendor-schemas] automated update --- CHANGELOG.rst | 2 +- .../builtin_schemas/vendor/gitlab-ci.json | 21 +++++----- .../builtin_schemas/vendor/gitlab-ci.sha256 | 2 +- .../builtin_schemas/vendor/renovate.json | 38 +++++++++++++++++-- .../builtin_schemas/vendor/renovate.sha256 | 2 +- 5 files changed, 47 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 94510efe5..b3484b290 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Unreleased .. vendor-insert-here -- Update vendored schemas (2024-04-14) +- Update vendored schemas (2024-04-21) 0.28.2 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json index febefd6b3..0f8f76efb 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.json @@ -142,7 +142,7 @@ }, { "type": "array", - "minLength": 1, + "minItems": 1, "items": { "type": "string" } @@ -958,7 +958,7 @@ }, { "type": "array", - "minLength": 1, + "minItems": 1, "items": { "type": "string" } @@ -1010,7 +1010,7 @@ }, { "type": "array", - "minLength": 1, + "minItems": 1, "items": { "type": "string" } @@ -1090,8 +1090,7 @@ "additionalProperties": false } ] - }, - "additionalProperties": false + } } }, "jobVariables": { @@ -1121,8 +1120,7 @@ "additionalProperties": false } ] - }, - "additionalProperties": false + } } }, "rulesVariables": { @@ -1135,8 +1133,7 @@ "number", "string" ] - }, - "additionalProperties": false + } } }, "if": { @@ -1754,7 +1751,7 @@ }, { "type": "array", - "minLength": 1, + "minItems": 1, "items": { "type": "string" } @@ -2343,7 +2340,7 @@ }, "tags": { "type": "array", - "minLength": 1, + "minItems": 1, "markdownDescription": "Used to select runners from the list of available runners. A runner must have all tags listed here to run the job. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#tags).", "items": { "anyOf": [ @@ -2353,7 +2350,7 @@ }, { "type": "array", - "minLength": 1, + "minItems": 1, "items": { "type": "string" } diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 index af6d5a7ef..781b18e90 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 @@ -1 +1 @@ -fd6be5cd001bd79e0a0a0a10111b84d41e854ec18fb285cf2414b4c85bac533c \ No newline at end of file +27b78ab0e321dfa26707da6159bf21d0cb18f51fba9b5645ae68449e06ee24e4 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 9ecdffbaa..0f4bffd02 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -809,8 +809,7 @@ "default": {}, "additionalProperties": { "type": "string" - }, - "$ref": "#" + } }, "defaultRegistryUrls": { "description": "List of registry URLs to use as the default for a datasource.", @@ -934,7 +933,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:10.3.13" + "default": "ghcr.io/containerbase/sidecar:10.3.15" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -1566,6 +1565,11 @@ }, "$ref": "#" }, + "httpCacheTtlDays": { + "description": "Maximum duration in days to keep HTTP cache entries.", + "type": "integer", + "default": 90 + }, "ignoreDeprecated": { "description": "Avoid upgrading from a non-deprecated version to a deprecated one.", "type": "boolean", @@ -2130,6 +2134,20 @@ } ] }, + "excludeDepPrefixes": { + "description": "Dep names prefixes to exclude. Valid only within a `packageRules` object.", + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "type": "string" + } + ] + }, "excludePackageNames": { "description": "Package names to exclude. Valid only within a `packageRules` object.", "oneOf": [ @@ -2298,6 +2316,20 @@ } ] }, + "matchDepPrefixes": { + "description": "Dep names prefixes to match. Valid only within a `packageRules` object.", + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "type": "string" + } + ] + }, "matchDepTypes": { "description": "List of depTypes to match (e.g. [`peerDependencies`]). Valid only within `packageRules` object.", "oneOf": [ diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 index aca382195..4420583d3 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 @@ -1 +1 @@ -ffad7a78901c229bcd47b8fe862e4d01eea794b2404276eb405f7504372a3839 \ No newline at end of file +430c7e757227298efd634057562051358fbba62db23aa14ba7bad3f7c89e3ec6 \ No newline at end of file From 829303ebb8d3b0c01dd84f95e1d93d5c22d474a5 Mon Sep 17 00:00:00 2001 From: sirosen <1300022+sirosen@users.noreply.github.com> Date: Sun, 28 Apr 2024 04:20:54 +0000 Subject: [PATCH 04/17] [vendor-schemas] automated update --- CHANGELOG.rst | 2 +- .../builtin_schemas/vendor/renovate.json | 17 ++++++++++++++++- .../builtin_schemas/vendor/renovate.sha256 | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b3484b290..6d6a2f459 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Unreleased .. vendor-insert-here -- Update vendored schemas (2024-04-21) +- Update vendored schemas (2024-04-28) 0.28.2 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 0f4bffd02..0791ca9cd 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -901,6 +901,17 @@ "type": "boolean", "default": false }, + "devcontainer": { + "description": "Configuration object for the devcontainer manager", + "type": "object", + "default": { + "fileMatch": [ + "^.devcontainer/devcontainer.json$", + "^.devcontainer.json$" + ] + }, + "$ref": "#" + }, "digest": { "description": "Configuration to apply when updating a digest (no change in tag/version).", "type": "object", @@ -933,7 +944,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:10.3.15" + "default": "ghcr.io/containerbase/sidecar:10.5.0" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -1541,6 +1552,10 @@ "type": "integer", "default": 60 }, + "readOnly": { + "description": "Match against requests that only read data and do not mutate anything.", + "type": "boolean" + }, "timeout": { "description": "Timeout (in milliseconds) for queries to external endpoints.", "type": "integer" diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 index 4420583d3..bd6491b33 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 @@ -1 +1 @@ -430c7e757227298efd634057562051358fbba62db23aa14ba7bad3f7c89e3ec6 \ No newline at end of file +5b5f1a64a66d41b99627899ccbe5ea47800720a9418c68bc7865ef2a5acb4f13 \ No newline at end of file From 5c11e293d0380bdac388c6fba533c674f9d45fe4 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Sat, 27 Apr 2024 23:31:50 -0500 Subject: [PATCH 05/17] Update build/setuptools sdist CI checks setuptools has been fixed to canonicalize the package name in sdist names per the sdist spec (PEP 625). This requires that hyphens convert to underscores. Testing use of that sdist requires correct naming to match, naturally. --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b789ed4f3..1d58f928a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -51,11 +51,11 @@ jobs: python -m build --sdist version="$(grep '^version' setup.cfg | cut -d '=' -f2 | tr -d ' ')" cd dist - tar -xzf "check-jsonschema-${version}.tar.gz" + tar -xzf "check_jsonschema-${version}.tar.gz" - name: test run: | version="$(grep '^version' setup.cfg | cut -d '=' -f2 | tr -d ' ')" - cd "dist/check-jsonschema-${version}" + cd "dist/check_jsonschema-${version}" python -m tox run -m ci ci-test-matrix: From b8b67c79c75d497b6adb677fb8e2afd5061ec38c Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Sun, 28 Apr 2024 09:13:30 -0500 Subject: [PATCH 06/17] Try to resolve linting inconsistency flake8 is not flagging this missing space locally, but it is failling in pre-commit.ci --- tests/unit/formats/test_rfc3339.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/formats/test_rfc3339.py b/tests/unit/formats/test_rfc3339.py index 942aee202..84c096b5c 100644 --- a/tests/unit/formats/test_rfc3339.py +++ b/tests/unit/formats/test_rfc3339.py @@ -78,7 +78,7 @@ def test_basic_bounds_validated(datestr): ) def test_day_bounds_by_month(month, maxday): good_date = f"2020-{month:02}-{maxday:02}T00:00:00Z" - bad_date = f"2020-{month:02}-{maxday+1:02}T00:00:00Z" + bad_date = f"2020-{month:02}-{(maxday + 1):02}T00:00:00Z" assert validate(good_date) assert not validate(bad_date) @@ -94,6 +94,6 @@ def test_day_bounds_by_month(month, maxday): ) def test_day_bounds_for_february(year, maxday): good_date = f"{year}-02-{maxday:02}T00:00:00Z" - bad_date = f"{year}-02-{maxday+1:02}T00:00:00Z" + bad_date = f"{year}-02-{(maxday + 1):02}T00:00:00Z" assert validate(good_date) assert not validate(bad_date) From 0e0be665b0f5b164b8172b644e1cf2e1ae95d4cf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:41:56 +0000 Subject: [PATCH 07/17] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/python-jsonschema/check-jsonschema: 0.28.1 → 0.28.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.28.1...0.28.2) - [github.com/psf/black-pre-commit-mirror: 24.3.0 → 24.4.2](https://github.com/psf/black-pre-commit-mirror/compare/24.3.0...24.4.2) - [github.com/sirosen/slyp: 0.6.0 → 0.6.1](https://github.com/sirosen/slyp/compare/0.6.0...0.6.1) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 228f9c030..7f6b27c26 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.28.1 + rev: 0.28.2 hooks: - id: check-dependabot - id: check-github-workflows @@ -19,7 +19,7 @@ repos: - id: check-merge-conflict - id: trailing-whitespace - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.3.0 + rev: 24.4.2 hooks: - id: black - repo: https://github.com/PyCQA/flake8 @@ -31,7 +31,7 @@ repos: - 'flake8-typing-as-t==0.0.3' - 'flake8-comprehensions==3.14.0' - repo: https://github.com/sirosen/slyp - rev: 0.6.0 + rev: 0.6.1 hooks: - id: slyp - repo: https://github.com/PyCQA/isort From bfdf2e3b53c869fcd4e6e24eedbfc5b29757d4e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 05:10:14 +0000 Subject: [PATCH 08/17] Bump furo from 2024.1.29 to 2024.4.27 Bumps [furo](https://github.com/pradyunsg/furo) from 2024.1.29 to 2024.4.27. - [Release notes](https://github.com/pradyunsg/furo/releases) - [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md) - [Commits](https://github.com/pradyunsg/furo/compare/2024.01.29...2024.04.27) --- updated-dependencies: - dependency-name: furo dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 8aae927d7..87f3e1710 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,7 @@ dev = docs = sphinx<8 sphinx-issues<5 - furo==2024.1.29 + furo==2024.4.27 [isort] profile = black From c5dc4f46d9e8e5c37e674034472541c27384d2e8 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:09:56 -0400 Subject: [PATCH 09/17] Move hashes to `sha256` --- scripts/vendor-schemas.py | 2 +- .../builtin_schemas/vendor/{ => sha256}/azure-pipelines.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/bamboo-spec.sha256 | 0 .../vendor/{ => sha256}/bitbucket-pipelines.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/buildkite.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/cloudbuild.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/dependabot.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/drone-ci.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/github-actions.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/github-workflows.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/gitlab-ci.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/readthedocs.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/renovate.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/taskfile.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/travis.sha256 | 0 .../builtin_schemas/vendor/{ => sha256}/woodpecker-ci.sha256 | 0 16 files changed, 1 insertion(+), 1 deletion(-) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/azure-pipelines.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/bamboo-spec.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/bitbucket-pipelines.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/buildkite.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/cloudbuild.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/dependabot.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/drone-ci.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/github-actions.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/github-workflows.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/gitlab-ci.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/readthedocs.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/renovate.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/taskfile.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/travis.sha256 (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => sha256}/woodpecker-ci.sha256 (100%) diff --git a/scripts/vendor-schemas.py b/scripts/vendor-schemas.py index 4d7d4ccdb..e7948be43 100644 --- a/scripts/vendor-schemas.py +++ b/scripts/vendor-schemas.py @@ -33,7 +33,7 @@ def schema2filename(name: str) -> str: def schema2hashfile(name: str) -> str: - return f"src/check_jsonschema/builtin_schemas/vendor/{name}.sha256" + return f"src/check_jsonschema/builtin_schemas/vendor/sha256/{name}.sha256" def file2digest(filepath: str) -> str: diff --git a/src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/azure-pipelines.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/azure-pipelines.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/bamboo-spec.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/bamboo-spec.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/bitbucket-pipelines.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/bitbucket-pipelines.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/bitbucket-pipelines.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/bitbucket-pipelines.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/buildkite.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/buildkite.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/buildkite.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/cloudbuild.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/cloudbuild.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/cloudbuild.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/cloudbuild.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/dependabot.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/dependabot.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/drone-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/drone-ci.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/drone-ci.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/drone-ci.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-actions.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-actions.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/github-actions.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/github-actions.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/github-workflows.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/github-workflows.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/gitlab-ci.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/gitlab-ci.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/readthedocs.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/readthedocs.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/readthedocs.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/renovate.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/taskfile.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/taskfile.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/taskfile.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/travis.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/travis.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/travis.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/travis.sha256 diff --git a/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.sha256 rename to src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 From bcc0f4f2cd3d065526417f155487aff677453229 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:10:42 -0400 Subject: [PATCH 10/17] Move license to `licenses` --- .../builtin_schemas/vendor/{ => licenses}/LICENSE.azure-pipelines | 0 .../vendor/{ => licenses}/LICENSE.bitbucket-pipelines | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.buildkite | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.gitlab | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.readthedocs | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.renovate | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.schemastore | 0 .../builtin_schemas/vendor/{ => licenses}/LICENSE.task | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.azure-pipelines (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.bitbucket-pipelines (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.buildkite (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.gitlab (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.readthedocs (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.renovate (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.schemastore (100%) rename src/check_jsonschema/builtin_schemas/vendor/{ => licenses}/LICENSE.task (100%) diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.bitbucket-pipelines b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.bitbucket-pipelines similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.bitbucket-pipelines rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.bitbucket-pipelines diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.buildkite b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.buildkite similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.buildkite rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.buildkite diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.gitlab b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.gitlab similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.gitlab rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.gitlab diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.readthedocs b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.readthedocs similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.readthedocs rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.readthedocs diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.renovate b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.renovate similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.renovate rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.renovate diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.schemastore b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.schemastore similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.schemastore rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.schemastore diff --git a/src/check_jsonschema/builtin_schemas/vendor/LICENSE.task b/src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.task similarity index 100% rename from src/check_jsonschema/builtin_schemas/vendor/LICENSE.task rename to src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.task From 35272de6e99cc11e57ddb66be46295381e0f838c Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:15:13 -0400 Subject: [PATCH 11/17] Update docs --- .../builtin_schemas/vendor/README.md | 28 +------------------ .../builtin_schemas/vendor/sha256/README.md | 2 ++ 2 files changed, 3 insertions(+), 27 deletions(-) create mode 100644 src/check_jsonschema/builtin_schemas/vendor/sha256/README.md diff --git a/src/check_jsonschema/builtin_schemas/vendor/README.md b/src/check_jsonschema/builtin_schemas/vendor/README.md index 8258e3cfc..d1872e5ba 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/README.md +++ b/src/check_jsonschema/builtin_schemas/vendor/README.md @@ -7,30 +7,4 @@ For the exact list of schemas here, see the repo root for hook config. Most of the schemas in this directory are provided by SchemaStore. They are therefore licensed under the SchemaStore license, included in this directory. -Additional licenses are provided for other sources as noted below. - -### Azure Pipelines - -The Azure pipelines schema is provided by Microsoft and is licensed under the -license for azure-pipelines-vscode. - -### ReadTheDocs - -The ReadTheDocs schema is provided by ReadTheDocs and licensed under the -license for readthedocs.org - -### Renovate - -The Renovate schema is provided by Renovate and licensed under the license for -renovatebot - -### GitLab - -The GitLab CI schema is provided by GitLab and licensed under the license for -the public gitlab repo. In particular, it falls under the "MIT Expat" portion -of the license for that repo. - -### Buildkite - -The Buildkite schema is provided by Buildkite and licensed under the license -for their 'pipeline-schema' repo. +Additional licenses can be found in [`licenses`](licenses). diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/README.md b/src/check_jsonschema/builtin_schemas/vendor/sha256/README.md new file mode 100644 index 000000000..a32082980 --- /dev/null +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/README.md @@ -0,0 +1,2 @@ +# sha256 +Files in this directory are used for updating vendor schemas when they change. From 7864b3bf0b5dc4ffbae21d5d7b88c1019c7c8a21 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:21:29 -0400 Subject: [PATCH 12/17] Re-add license notes --- .../builtin_schemas/vendor/README.md | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/check_jsonschema/builtin_schemas/vendor/README.md b/src/check_jsonschema/builtin_schemas/vendor/README.md index d1872e5ba..c628dc823 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/README.md +++ b/src/check_jsonschema/builtin_schemas/vendor/README.md @@ -8,3 +8,29 @@ For the exact list of schemas here, see the repo root for hook config. Most of the schemas in this directory are provided by SchemaStore. They are therefore licensed under the SchemaStore license, included in this directory. Additional licenses can be found in [`licenses`](licenses). + +### Azure Pipelines + +The Azure pipelines schema is provided by Microsoft and is licensed under the +license for azure-pipelines-vscode. + +### ReadTheDocs + +The ReadTheDocs schema is provided by ReadTheDocs and licensed under the +license for readthedocs.org + +### Renovate + +The Renovate schema is provided by Renovate and licensed under the license for +renovatebot + +### GitLab + +The GitLab CI schema is provided by GitLab and licensed under the license for +the public gitlab repo. In particular, it falls under the "MIT Expat" portion +of the license for that repo. + +### Buildkite + +The Buildkite schema is provided by Buildkite and licensed under the license +for their 'pipeline-schema' repo. From ef6136777572da3b13f02c2dc78daedb157b50e6 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:24:23 -0400 Subject: [PATCH 13/17] Add taskfile note --- src/check_jsonschema/builtin_schemas/vendor/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/check_jsonschema/builtin_schemas/vendor/README.md b/src/check_jsonschema/builtin_schemas/vendor/README.md index c628dc823..c47e81d67 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/README.md +++ b/src/check_jsonschema/builtin_schemas/vendor/README.md @@ -34,3 +34,8 @@ of the license for that repo. The Buildkite schema is provided by Buildkite and licensed under the license for their 'pipeline-schema' repo. + +### Taskfile + +The Taskfile schema is provided by Task and licensed under the license +for their 'task' repo. From 5892a636d139610912025ed967a85eece90499e7 Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 13:30:25 -0400 Subject: [PATCH 14/17] Update license refs --- src/check_jsonschema/transforms/azure_pipelines.py | 2 +- .../positive/azure-pipelines/expression-from-lang-server.yaml | 2 +- tests/example-files/hooks/positive/buildkite/matrix.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/check_jsonschema/transforms/azure_pipelines.py b/src/check_jsonschema/transforms/azure_pipelines.py index 2a084374d..8888a9e6b 100644 --- a/src/check_jsonschema/transforms/azure_pipelines.py +++ b/src/check_jsonschema/transforms/azure_pipelines.py @@ -7,7 +7,7 @@ That source is licensed under the MIT License. The original license can be found in - src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines + src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines The transform does not deeply interpret the expressions. It just "unnests" them. diff --git a/tests/example-files/hooks/positive/azure-pipelines/expression-from-lang-server.yaml b/tests/example-files/hooks/positive/azure-pipelines/expression-from-lang-server.yaml index 3e42639ce..2adf20285 100644 --- a/tests/example-files/hooks/positive/azure-pipelines/expression-from-lang-server.yaml +++ b/tests/example-files/hooks/positive/azure-pipelines/expression-from-lang-server.yaml @@ -2,7 +2,7 @@ # https://github.com/microsoft/azure-pipelines-language-server/blob/71b20f92874c02dfe82ad2cc2dcc7fa64996be91/language-service/test/pipelinesTests/yamlvalidation.test.ts#L50 # # original license can be found in -# src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines +# src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines # steps: - ${{ if succeeded() }}: diff --git a/tests/example-files/hooks/positive/buildkite/matrix.yml b/tests/example-files/hooks/positive/buildkite/matrix.yml index 4a5d7710e..5ee13d1ed 100644 --- a/tests/example-files/hooks/positive/buildkite/matrix.yml +++ b/tests/example-files/hooks/positive/buildkite/matrix.yml @@ -1,6 +1,6 @@ # this example copied from the buildkite pipeline-schema repo # it is therefore licensed under the existing buildkite MIT license -# see src/check_jsonschema/builtin_schemas/vendor/ for license details +# see src/check_jsonschema/builtin_schemas/vendor/licenses for license details steps: - command: "echo {{matrix}}" From 2e9a34897d2cf37f08e35f8e34ebd70cf192345f Mon Sep 17 00:00:00 2001 From: Jordan Bradford <36420801+jrdnbradford@users.noreply.github.com> Date: Fri, 3 May 2024 15:29:45 -0400 Subject: [PATCH 15/17] Allow validation of Cloud Build `json` configs --- .pre-commit-hooks.yaml | 4 ++-- src/check_jsonschema/catalog.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 7bb450616..306f5f805 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -76,8 +76,8 @@ description: 'Validate Google Cloud Build config against the schema provided by SchemaStore' entry: check-jsonschema --builtin-schema vendor.cloudbuild language: python - files: ^cloudbuild\.(yml|yaml)$ - types: [yaml] + files: ^cloudbuild\.(yml|yaml|json)$ + types_or: [json,yaml] # this hook is autogenerated from a script # to modify this hook, update `src/check_jsonschema/catalog.py` diff --git a/src/check_jsonschema/catalog.py b/src/check_jsonschema/catalog.py index 24d408da4..4fea96c86 100644 --- a/src/check_jsonschema/catalog.py +++ b/src/check_jsonschema/catalog.py @@ -74,8 +74,12 @@ def _githubusercontent_url(owner: str, repo: str, ref: str, path: str) -> str: "url": "https://json.schemastore.org/cloudbuild.json", "hook_config": { "name": "Validate Google Cloud Build config", - "files": r"^cloudbuild\.(yml|yaml)$", - "types": "yaml", + "description": ( + "Validate Google Cloud Build config against the schema provided " + "by SchemaStore" + ), + "files": r"^cloudbuild\.(yml|yaml|json)$", + "types_or": ["json", "yaml"], }, }, "dependabot": { From eca792c610f8a6f320cc8a2ceb9b888f3bd1fa2b Mon Sep 17 00:00:00 2001 From: sirosen <1300022+sirosen@users.noreply.github.com> Date: Sun, 5 May 2024 04:23:12 +0000 Subject: [PATCH 16/17] [vendor-schemas] automated update --- CHANGELOG.rst | 2 +- .../builtin_schemas/vendor/dependabot.json | 22 ++++++++++++++++++- .../builtin_schemas/vendor/renovate.json | 10 +++++++-- .../vendor/sha256/dependabot.sha256 | 2 +- .../vendor/sha256/renovate.sha256 | 2 +- .../vendor/sha256/woodpecker-ci.sha256 | 2 +- .../builtin_schemas/vendor/woodpecker-ci.json | 15 +++++++++++++ 7 files changed, 48 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6d6a2f459..29896a768 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Unreleased .. vendor-insert-here -- Update vendored schemas (2024-04-28) +- Update vendored schemas (2024-05-05) 0.28.2 ------ diff --git a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json index fab410b9f..f4a9a76b4 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/dependabot.json +++ b/src/check_jsonschema/builtin_schemas/vendor/dependabot.json @@ -746,6 +746,16 @@ ], "additionalProperties": false }, + "directories": { + "description": "Locations of package manifests", + "type": "array", + "items": { + "type": "string", + "minLength": 1 + }, + "minItems": 1, + "uniqueItems": true + }, "directory": { "description": "Location of package manifests", "type": "string", @@ -957,7 +967,17 @@ "description": "How to update manifest version requirements" } }, - "required": ["package-ecosystem", "directory", "schedule"] + "allOf": [ + { + "required": ["package-ecosystem", "schedule"] + }, + { + "oneOf": [ + { "required": ["directories"] }, + { "required": ["directory"] } + ] + } + ] }, "registry": { "type": "object", diff --git a/src/check_jsonschema/builtin_schemas/vendor/renovate.json b/src/check_jsonschema/builtin_schemas/vendor/renovate.json index 0791ca9cd..872560884 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/renovate.json +++ b/src/check_jsonschema/builtin_schemas/vendor/renovate.json @@ -944,7 +944,7 @@ "dockerSidecarImage": { "description": "Change this value to override the default Renovate sidecar image.", "type": "string", - "default": "ghcr.io/containerbase/sidecar:10.5.0" + "default": "ghcr.io/containerbase/sidecar:10.6.0" }, "dockerUser": { "description": "Set the `UID` and `GID` for Docker-based binaries if you use `binarySource=docker`.", @@ -1155,7 +1155,8 @@ "type": "object", "default": { "fileMatch": [ - "(^|/)\\.fvm/fvm_config\\.json$" + "(^|/)\\.fvm/fvm_config\\.json$", + "(^|/)\\.fvmrc$" ], "versioning": "semver" }, @@ -3422,6 +3423,11 @@ "type": "boolean", "default": true }, + "userAgent": { + "description": "If set to any string, Renovate will use this as the `user-agent` it sends with HTTP requests.", + "type": "string", + "default": null + }, "userStrings": { "description": "User-facing strings for the Renovate comment when a PR is closed.", "type": "object", diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 index e4cc05a44..d7eb621d7 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/dependabot.sha256 @@ -1 +1 @@ -1ca8e8e09124a16930e7f6434b596e07c0835c2a7ed0857cb2c8aec67efb5039 \ No newline at end of file +f68c06703b5e0fa54ea5800d198dae1bcb1df99d26f9067d64f5df836402e12a \ 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 bd6491b33..827de0d84 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/renovate.sha256 @@ -1 +1 @@ -5b5f1a64a66d41b99627899ccbe5ea47800720a9418c68bc7865ef2a5acb4f13 \ No newline at end of file +55cc2bb903967bb6d13744bd895e96717ebe2ab785fe3dfcc23c1a7c42b759e2 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 b/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 index e77f8c40e..ac3d69ba0 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 +++ b/src/check_jsonschema/builtin_schemas/vendor/sha256/woodpecker-ci.sha256 @@ -1 +1 @@ -f486bb80b1e502f01bf6d718eef1530501fbeca043f768bae5fe50779d437185 \ No newline at end of file +004b2133059640755375e1c5cb899a3f026c305147145cdd0f47563fa91f9961 \ No newline at end of file diff --git a/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json b/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json index 13d7af690..289b524e2 100644 --- a/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json +++ b/src/check_jsonschema/builtin_schemas/vendor/woodpecker-ci.json @@ -371,6 +371,21 @@ }, "backend_options": { "$ref": "#/definitions/step_backend_options" + }, + "entrypoint": { + "description": "Defines container entrypoint.", + "oneOf": [ + { + "type": "array", + "minLength": 1, + "items": { + "type": "string" + } + }, + { + "type": "string" + } + ] } } }, From cf1014d93a3500d3b6127e00bd183467532eea63 Mon Sep 17 00:00:00 2001 From: Stephen Rosen Date: Tue, 7 May 2024 09:31:31 -0500 Subject: [PATCH 17/17] Bump version and changelog for release --- CHANGELOG.rst | 8 +++++++- README.md | 2 +- docs/optional_parsers.rst | 4 ++-- docs/precommit_usage.rst | 38 +++++++++++++++++++------------------- setup.cfg | 2 +- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 29896a768..8f301d30d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,13 @@ Unreleased .. vendor-insert-here -- Update vendored schemas (2024-05-05) +0.28.3 +------ + +- Update vendored schemas: dependabot, github-workflows, gitlab-ci, renovate, + woodpecker-ci (2024-05-05) +- Update Cloud Build pre-commit hook to support JSON Cloud Build config. Thanks + :user:`jrdnbradford`! (:pr:`427`) 0.28.2 ------ diff --git a/README.md b/README.md index 31428b912..9e1bb9250 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ files. ```yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-github-workflows args: ["--verbose"] diff --git a/docs/optional_parsers.rst b/docs/optional_parsers.rst index 87d6fe2eb..70d71bbe7 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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.3 hooks: - id: check-jsonschema name: 'Check GitHub Workflows' diff --git a/docs/precommit_usage.rst b/docs/precommit_usage.rst index f4f5c6154..11abd9535 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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.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.28.2 + rev: 0.28.3 hooks: - id: check-buildkite @@ -108,7 +108,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.28.2 + rev: 0.28.3 hooks: - id: check-cloudbuild @@ -122,7 +122,7 @@ Validate Dependabot Config (v2) against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-dependabot @@ -136,7 +136,7 @@ Validate Drone-CI Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-drone-ci @@ -150,7 +150,7 @@ Validate GitHub Actions against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-github-actions @@ -164,7 +164,7 @@ Validate GitHub Workflows against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-github-workflows @@ -178,7 +178,7 @@ Validate GitLab CI config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-gitlab-ci @@ -192,7 +192,7 @@ Validate ReadTheDocs config against the schema provided by ReadTheDocs :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-readthedocs @@ -206,7 +206,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.28.2 + rev: 0.28.3 hooks: - id: check-renovate @@ -220,7 +220,7 @@ Validate Taskfile config against the schema provided by Task :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-taskfile @@ -234,7 +234,7 @@ Validate Travis Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-travis @@ -248,7 +248,7 @@ Validate Woodpecker Config against the schema provided by SchemaStore :caption: example config - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-woodpecker-ci @@ -274,7 +274,7 @@ manually, you could do this: .. code-block:: yaml - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.2 + rev: 0.28.3 hooks: - id: check-jsonschema name: "Check GitHub Workflows" @@ -293,7 +293,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.28.2 + rev: 0.28.3 hooks: - id: check-jsonschema name: "Check GitHub Workflows set timeout-minutes" diff --git a/setup.cfg b/setup.cfg index 87f3e1710..a4afff77d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = check-jsonschema -version = 0.28.2 +version = 0.28.3 description = A jsonschema CLI and pre-commit hook long_description = file: README.md long_description_content_type = text/markdown