Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fs mode to use --key-path CLI switch / key_path API argument #670

Merged
merged 9 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ dependencies:
- python >=3.9,<3.13 # keep in sync with meta.yaml run req
- sphinx_rtd_theme 3.0.*
- sphinxcontrib-bibtex 2.6.*
- tree
- tree 2.2.*
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/cdeps/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/fv3/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/ioda/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/jedi/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/mpas/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/orog/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/shave/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/ungrib/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/drivers/upp/run-help.out
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--schema-file PATH
Path to schema file to use for validation
--quiet, -q
Expand Down
3 changes: 1 addition & 2 deletions docs/sections/user_guide/cli/tools/execute/help.out
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ Optional arguments:
--graph-file PATH
Path to Graphviz DOT output [experimental]
--key-path KEY[.KEY...]
Dot-separated path of keys leading through the config to the driver's
configuration block
Dot-separated path of keys to driver config block
--quiet, -q
Print no logging messages
--verbose, -v
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
uw fs copy --config-file copy-config.yaml config files
uw fs copy --config-file copy-config.yaml --key-path config.files
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf copy-dst-timedep
uw fs copy --target-dir copy-dst-timedep --config-file copy-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 config files
uw fs copy --target-dir copy-dst-timedep --config-file copy-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 --key-path config.files
echo
tree copy-dst-timedep
2 changes: 1 addition & 1 deletion docs/sections/user_guide/cli/tools/fs/copy-exec.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf copy-dst
uw fs copy --target-dir copy-dst --config-file copy-config.yaml config files
uw fs copy --target-dir copy-dst --config-file copy-config.yaml --key-path config.files
echo
tree copy-dst
9 changes: 4 additions & 5 deletions docs/sections/user_guide/cli/tools/fs/copy-help.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
usage: uw fs copy [-h] [--version] [--config-file PATH] [--target-dir PATH]
[--cycle CYCLE] [--leadtime LEADTIME] [--dry-run] [--quiet]
[--verbose]
[KEY ...]
[--cycle CYCLE] [--leadtime LEADTIME] [--dry-run]
[--key-path KEY[.KEY...]] [--quiet] [--verbose]

Copy files

Expand All @@ -20,9 +19,9 @@ Optional arguments:
The leadtime as hours[:minutes[:seconds]]
--dry-run
Only log info, making no changes
--key-path KEY[.KEY...]
Dot-separated path of keys to config block to use
--quiet, -q
Print no logging messages
--verbose, -v
Print all logging messages
KEY
YAML key leading to file dst/src block
Original file line number Diff line number Diff line change
@@ -1 +1 @@
uw fs link --config-file link-config.yaml config files
uw fs link --config-file link-config.yaml --key-path config.files
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf link-dst-timedep
uw fs link --target-dir link-dst-timedep --config-file link-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 config files
uw fs link --target-dir link-dst-timedep --config-file link-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 --key-path config.files
echo
tree link-dst-timedep
2 changes: 1 addition & 1 deletion docs/sections/user_guide/cli/tools/fs/link-exec.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf link-dst
uw fs link --target-dir link-dst --config-file link-config.yaml config files
uw fs link --target-dir link-dst --config-file link-config.yaml --key-path config.files
echo
tree link-dst
9 changes: 4 additions & 5 deletions docs/sections/user_guide/cli/tools/fs/link-help.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
usage: uw fs link [-h] [--version] [--config-file PATH] [--target-dir PATH]
[--cycle CYCLE] [--leadtime LEADTIME] [--dry-run] [--quiet]
[--verbose]
[KEY ...]
[--cycle CYCLE] [--leadtime LEADTIME] [--dry-run]
[--key-path KEY[.KEY...]] [--quiet] [--verbose]

Link files

Expand All @@ -20,9 +19,9 @@ Optional arguments:
The leadtime as hours[:minutes[:seconds]]
--dry-run
Only log info, making no changes
--key-path KEY[.KEY...]
Dot-separated path of keys to config block to use
--quiet, -q
Print no logging messages
--verbose, -v
Print all logging messages
KEY
YAML key leading to file dst/src block
Original file line number Diff line number Diff line change
@@ -1 +1 @@
uw fs makedirs --config-file makedirs-config.yaml config
uw fs makedirs --config-file makedirs-config.yaml --key-path config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf makedirs-parent-timedep
uw fs makedirs --target-dir makedirs-parent-timedep --config-file makedirs-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 config
uw fs makedirs --target-dir makedirs-parent-timedep --config-file makedirs-config-timedep.yaml --cycle 2024-05-29T12 --leadtime 6 --key-path config
echo
tree -F makedirs-parent-timedep
2 changes: 1 addition & 1 deletion docs/sections/user_guide/cli/tools/fs/makedirs-exec.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf makedirs-parent
uw fs makedirs --target-dir makedirs-parent --config-file makedirs-config.yaml config
uw fs makedirs --target-dir makedirs-parent --config-file makedirs-config.yaml --key-path config
echo
tree -F makedirs-parent
8 changes: 4 additions & 4 deletions docs/sections/user_guide/cli/tools/fs/makedirs-help.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
usage: uw fs makedirs [-h] [--version] [--config-file PATH]
[--target-dir PATH] [--cycle CYCLE]
[--leadtime LEADTIME] [--dry-run] [--quiet] [--verbose]
[KEY ...]
[--leadtime LEADTIME] [--dry-run]
[--key-path KEY[.KEY...]] [--quiet] [--verbose]

Make directories

Expand All @@ -20,9 +20,9 @@ Optional arguments:
The leadtime as hours[:minutes[:seconds]]
--dry-run
Only log info, making no changes
--key-path KEY[.KEY...]
Dot-separated path of keys to config block to use
--quiet, -q
Print no logging messages
--verbose, -v
Print all logging messages
KEY
YAML key leading to file dst/src block
2 changes: 1 addition & 1 deletion notebooks/config.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
" :param update_format: Format of the update config (optional if file's extension is recognized).\n",
" :param output_file: Output config file (``None`` => write to ``stdout``).\n",
" :param output_format: Format of the output config (optional if file's extension is recognized).\n",
" :param key_path: Path through keys to the desired output block.\n",
" :param key_path: Path of keys to the desired output block.\n",
" :param values_needed: Report complete, missing, and template values.\n",
" :param total: Require rendering of all Jinja2 variables/expressions.\n",
" :param dry_run: Log output instead of writing to output.\n",
Expand Down
Loading
Loading