Skip to content

Commit

Permalink
Revert 'stage-files' to 'files-to-stage'
Browse files Browse the repository at this point in the history
  • Loading branch information
maddenp-noaa committed Aug 14, 2024
1 parent dc7e828 commit 778a2eb
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[2024-08-02T00:43:08] INFO Validating config against internal schema: stage-files
[2024-08-02T00:43:08] INFO Validating config against internal schema: files-to-stage
[2024-08-02T00:43:08] INFO 0 UW schema-validation errors found
[2024-08-02T00:43:08] INFO File copies: Initial state: Not Ready
[2024-08-02T00:43:08] INFO File copies: Checking requirements
Expand Down
2 changes: 1 addition & 1 deletion docs/sections/user_guide/cli/tools/file/copy-exec.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[2024-08-02T00:43:08] INFO Validating config against internal schema: stage-files
[2024-08-02T00:43:08] INFO Validating config against internal schema: files-to-stage
[2024-08-02T00:43:08] INFO 0 UW schema-validation errors found
[2024-08-02T00:43:08] INFO File copies: Initial state: Not Ready
[2024-08-02T00:43:08] INFO File copies: Checking requirements
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[2024-08-02T00:43:09] INFO Validating config against internal schema: stage-files
[2024-08-02T00:43:09] INFO Validating config against internal schema: files-to-stage
[2024-08-02T00:43:09] INFO 0 UW schema-validation errors found
[2024-08-02T00:43:09] INFO File links: Initial state: Not Ready
[2024-08-02T00:43:09] INFO File links: Checking requirements
Expand Down
2 changes: 1 addition & 1 deletion docs/sections/user_guide/cli/tools/file/link-exec.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[2024-08-02T00:43:08] INFO Validating config against internal schema: stage-files
[2024-08-02T00:43:08] INFO Validating config against internal schema: files-to-stage
[2024-08-02T00:43:08] INFO 0 UW schema-validation errors found
[2024-08-02T00:43:08] INFO File links: Initial state: Not Ready
[2024-08-02T00:43:08] INFO File links: Checking requirements
Expand Down
2 changes: 1 addition & 1 deletion src/uwtools/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def _schema(self) -> str:
"""
Returns the name of the schema to use for config validation.
"""
return "stage-files"
return "files-to-stage"


class Copier(FileStager):
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/fv3.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"type": "object"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"lateral_boundary_conditions": {
"additionalProperties": false,
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/ioda.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"$ref": "urn:uwtools:execution-serial"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"rundir": {
"type": "string"
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/jedi.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"$ref": "urn:uwtools:execution"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"rundir": {
"type": "string"
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/mpas-init.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"$ref": "urn:uwtools:execution"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"namelist": {
"additionalProperties": false,
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/mpas.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"$ref": "urn:uwtools:execution"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"lateral_boundary_conditions": {
"additionalProperties": false,
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/resources/jsonschema/upp.jsonschema
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"$ref": "urn:uwtools:execution"
},
"files_to_copy": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"files_to_link": {
"$ref": "urn:uwtools:stage-files"
"$ref": "urn:uwtools:files-to-stage"
},
"namelist": {
"additionalProperties": false,
Expand Down
4 changes: 2 additions & 2 deletions src/uwtools/tests/test_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -1845,11 +1845,11 @@ def test_schema_shave_rundir(shave_prop):
assert "88 is not of type 'string'\n" in errors(88)


# stage-files
# files-to-stage


def test_schema_stage_files():
errors = schema_validator("stage-files")
errors = schema_validator("files-to-stage")
# The input must be an dict:
assert "is not of type 'object'\n" in errors([])
# A str -> str dict is ok:
Expand Down

0 comments on commit 778a2eb

Please sign in to comment.