Merge pull request #426 from jrdnbradford/update-vendor-dir

Update vendor directories for organization
python-jsonschema · May 3, 2024 · 9c3ed2e · 9c3ed2e
2 parents 229943d + 5892a63
commit 9c3ed2e
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 5 deletions.
diff --git 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/README.md b/src/check_jsonschema/builtin_schemas/vendor/README.md
@@ -7,7 +7,7 @@ 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.
+Additional licenses can be found in [`licenses`](licenses).
 
 ### Azure Pipelines
 
@@ -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.
diff --git a/...in_schemas/vendor/LICENSE.azure-pipelines → ...s/vendor/licenses/LICENSE.azure-pipelines b/...in_schemas/vendor/LICENSE.azure-pipelines → ...s/vendor/licenses/LICENSE.azure-pipelines
diff --git a/...chemas/vendor/LICENSE.bitbucket-pipelines → ...ndor/licenses/LICENSE.bitbucket-pipelines b/...chemas/vendor/LICENSE.bitbucket-pipelines → ...ndor/licenses/LICENSE.bitbucket-pipelines
diff --git a/.../builtin_schemas/vendor/LICENSE.buildkite → ...schemas/vendor/licenses/LICENSE.buildkite b/.../builtin_schemas/vendor/LICENSE.buildkite → ...schemas/vendor/licenses/LICENSE.buildkite
diff --git a/...ema/builtin_schemas/vendor/LICENSE.gitlab → ...in_schemas/vendor/licenses/LICENSE.gitlab b/...ema/builtin_schemas/vendor/LICENSE.gitlab → ...in_schemas/vendor/licenses/LICENSE.gitlab
diff --git a/...uiltin_schemas/vendor/LICENSE.readthedocs → ...hemas/vendor/licenses/LICENSE.readthedocs b/...uiltin_schemas/vendor/LICENSE.readthedocs → ...hemas/vendor/licenses/LICENSE.readthedocs
diff --git a/...a/builtin_schemas/vendor/LICENSE.renovate → ..._schemas/vendor/licenses/LICENSE.renovate b/...a/builtin_schemas/vendor/LICENSE.renovate → ..._schemas/vendor/licenses/LICENSE.renovate
diff --git a/...uiltin_schemas/vendor/LICENSE.schemastore → ...hemas/vendor/licenses/LICENSE.schemastore b/...uiltin_schemas/vendor/LICENSE.schemastore → ...hemas/vendor/licenses/LICENSE.schemastore
diff --git a/...chema/builtin_schemas/vendor/LICENSE.task → ...ltin_schemas/vendor/licenses/LICENSE.task b/...chema/builtin_schemas/vendor/LICENSE.task → ...ltin_schemas/vendor/licenses/LICENSE.task
diff --git a/src/check_jsonschema/builtin_schemas/vendor/sha256/README.md 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.
diff --git a/...tin_schemas/vendor/azure-pipelines.sha256 → ...emas/vendor/sha256/azure-pipelines.sha256 b/...tin_schemas/vendor/azure-pipelines.sha256 → ...emas/vendor/sha256/azure-pipelines.sha256
diff --git a/...builtin_schemas/vendor/bamboo-spec.sha256 → ..._schemas/vendor/sha256/bamboo-spec.sha256 b/...builtin_schemas/vendor/bamboo-spec.sha256 → ..._schemas/vendor/sha256/bamboo-spec.sha256
diff --git a/...schemas/vendor/bitbucket-pipelines.sha256 → .../vendor/sha256/bitbucket-pipelines.sha256 b/...schemas/vendor/bitbucket-pipelines.sha256 → .../vendor/sha256/bitbucket-pipelines.sha256
diff --git a/...a/builtin_schemas/vendor/buildkite.sha256 → ...in_schemas/vendor/sha256/buildkite.sha256 b/...a/builtin_schemas/vendor/buildkite.sha256 → ...in_schemas/vendor/sha256/buildkite.sha256
diff --git a/.../builtin_schemas/vendor/cloudbuild.sha256 → ...n_schemas/vendor/sha256/cloudbuild.sha256 b/.../builtin_schemas/vendor/cloudbuild.sha256 → ...n_schemas/vendor/sha256/cloudbuild.sha256
diff --git a/.../builtin_schemas/vendor/dependabot.sha256 → ...n_schemas/vendor/sha256/dependabot.sha256 b/.../builtin_schemas/vendor/dependabot.sha256 → ...n_schemas/vendor/sha256/dependabot.sha256
diff --git a/...ma/builtin_schemas/vendor/drone-ci.sha256 → ...tin_schemas/vendor/sha256/drone-ci.sha256 b/...ma/builtin_schemas/vendor/drone-ci.sha256 → ...tin_schemas/vendor/sha256/drone-ci.sha256
diff --git a/...ltin_schemas/vendor/github-actions.sha256 → ...hemas/vendor/sha256/github-actions.sha256 b/...ltin_schemas/vendor/github-actions.sha256 → ...hemas/vendor/sha256/github-actions.sha256
diff --git a/...in_schemas/vendor/github-workflows.sha256 → ...mas/vendor/sha256/github-workflows.sha256 b/...in_schemas/vendor/github-workflows.sha256 → ...mas/vendor/sha256/github-workflows.sha256
diff --git a/...a/builtin_schemas/vendor/gitlab-ci.sha256 → ...in_schemas/vendor/sha256/gitlab-ci.sha256 b/...a/builtin_schemas/vendor/gitlab-ci.sha256 → ...in_schemas/vendor/sha256/gitlab-ci.sha256
diff --git a/...builtin_schemas/vendor/readthedocs.sha256 → ..._schemas/vendor/sha256/readthedocs.sha256 b/...builtin_schemas/vendor/readthedocs.sha256 → ..._schemas/vendor/sha256/readthedocs.sha256
diff --git a/...ma/builtin_schemas/vendor/renovate.sha256 → ...tin_schemas/vendor/sha256/renovate.sha256 b/...ma/builtin_schemas/vendor/renovate.sha256 → ...tin_schemas/vendor/sha256/renovate.sha256
diff --git a/...ma/builtin_schemas/vendor/taskfile.sha256 → ...tin_schemas/vendor/sha256/taskfile.sha256 b/...ma/builtin_schemas/vendor/taskfile.sha256 → ...tin_schemas/vendor/sha256/taskfile.sha256
diff --git a/...hema/builtin_schemas/vendor/travis.sha256 → ...iltin_schemas/vendor/sha256/travis.sha256 b/...hema/builtin_schemas/vendor/travis.sha256 → ...iltin_schemas/vendor/sha256/travis.sha256
diff --git a/...iltin_schemas/vendor/woodpecker-ci.sha256 → ...chemas/vendor/sha256/woodpecker-ci.sha256 b/...iltin_schemas/vendor/woodpecker-ci.sha256 → ...chemas/vendor/sha256/woodpecker-ci.sha256
diff --git 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
@@ -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
@@ -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}}"