Skip to content

Commit 9c3ed2e

Browse files
authored
Merge pull request python-jsonschema#426 from jrdnbradford/update-vendor-dir
Update vendor directories for organization
2 parents 229943d + 5892a63 commit 9c3ed2e

29 files changed

+12
-5
lines changed

scripts/vendor-schemas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def schema2filename(name: str) -> str:
3333

3434

3535
def schema2hashfile(name: str) -> str:
36-
return f"src/check_jsonschema/builtin_schemas/vendor/{name}.sha256"
36+
return f"src/check_jsonschema/builtin_schemas/vendor/sha256/{name}.sha256"
3737

3838

3939
def file2digest(filepath: str) -> str:

src/check_jsonschema/builtin_schemas/vendor/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ For the exact list of schemas here, see the repo root for hook config.
77

88
Most of the schemas in this directory are provided by SchemaStore. They are
99
therefore licensed under the SchemaStore license, included in this directory.
10-
Additional licenses are provided for other sources as noted below.
10+
Additional licenses can be found in [`licenses`](licenses).
1111

1212
### Azure Pipelines
1313

@@ -34,3 +34,8 @@ of the license for that repo.
3434

3535
The Buildkite schema is provided by Buildkite and licensed under the license
3636
for their 'pipeline-schema' repo.
37+
38+
### Taskfile
39+
40+
The Taskfile schema is provided by Task and licensed under the license
41+
for their 'task' repo.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# sha256
2+
Files in this directory are used for updating vendor schemas when they change.

src/check_jsonschema/transforms/azure_pipelines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
That source is licensed under the MIT License.
99
The original license can be found in
10-
src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines
10+
src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines
1111
1212
1313
The transform does not deeply interpret the expressions. It just "unnests" them.

tests/example-files/hooks/positive/azure-pipelines/expression-from-lang-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/microsoft/azure-pipelines-language-server/blob/71b20f92874c02dfe82ad2cc2dcc7fa64996be91/language-service/test/pipelinesTests/yamlvalidation.test.ts#L50
33
#
44
# original license can be found in
5-
# src/check_jsonschema/builtin_schemas/vendor/LICENSE.azure-pipelines
5+
# src/check_jsonschema/builtin_schemas/vendor/licenses/LICENSE.azure-pipelines
66
#
77
steps:
88
- ${{ if succeeded() }}:

tests/example-files/hooks/positive/buildkite/matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# this example copied from the buildkite pipeline-schema repo
22
# it is therefore licensed under the existing buildkite MIT license
3-
# see src/check_jsonschema/builtin_schemas/vendor/ for license details
3+
# see src/check_jsonschema/builtin_schemas/vendor/licenses for license details
44

55
steps:
66
- command: "echo {{matrix}}"

0 commit comments

Comments
 (0)