Skip to content

Commit 89c1839

Browse files
committed
Update documentation to use 'cset install-restricted-files' command
1 parent d33978b commit 89c1839

4 files changed

Lines changed: 48 additions & 12 deletions

File tree

docs/source/contributing/architecture.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ src/CSET/cset_workflow
185185
├── site # Site-specific cylc configuration.
186186
│   └── localhost.cylc
187187
├── flow.cylc # Workflow definition detailing how tasks are run.
188-
├── install_restricted_files.sh # Script for installing site-specific files.
189188
├── README.md
190189
├── rose-suite.conf # User configuration of workflow and diagnostics.
191190
└── rose-suite.conf.example # Blank user configuration to be copied.

docs/source/getting-started/run_full_cylc_workflow.rst

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,19 @@ With the newly created conda environment activated, run the ``cset
7171
extract-workflow`` command to unpack the workflow from inside the CSET package
7272
into a directory of your choosing. A sensible choice is ``~/cylc-src``, which is
7373
the default location where cylc will search for workflows.
74+
If you are at a Momentum® Partnership site with restricted site specific files
75+
you should also include the ``--restricted`` flag to install them.
7476

7577
.. code-block:: bash
7678
7779
# Create the cylc-src directory if it doesn't exist.
7880
mkdir -p ~/cylc-src
81+
7982
# Extract the workflow from CSET into the chosen directory.
8083
cset extract-workflow ~/cylc-src
84+
# Alternatively install the restricted site-specific files at Momentum sites.
85+
# cset extract-workflow --restricted ~/cylc-src
86+
8187
# Change into the freshly unpacked workflow directory.
8288
cd ~/cylc-src/cset-workflow-vX.Y.Z
8389
@@ -86,18 +92,19 @@ Your directory should look like this:
8692
.. code-block:: bash
8793
8894
$ ls
89-
app conda-environment includes lib opt rose-suite.conf.example
90-
bin flow.cylc install_restricted_files.sh meta README.md site
95+
app conda-environment includes meta README.md site
96+
bin flow.cylc lib opt rose-suite.conf.example
9197
9298
If you are at a site with specific CSET integration, such as the Met Office or
93-
Momentum Partnership, you will want to install the site specific configuration
99+
Momentum Partnership, and did not use the ``--restricted`` option to ``cset
100+
extract-workflow`` you will want to install the site specific configuration
94101
files that specify where cylc will run the tasks. This is done by running the
95-
``install_restricted_files.sh`` script. For other users, you can skip this step
96-
and use the ``localhost`` site instead.
102+
``cset install-restricted-files`` command. For other users, you can skip this
103+
step and use the ``localhost`` site instead.
97104

98105
.. code-block:: bash
99106
100-
./install_restricted_files.sh
107+
cset install-restricted-files /path/to/workflow
101108
102109
You have now installed the CSET workflow and are ready to use it.
103110

docs/source/reference/cli.rst

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,40 @@ usage see :doc:`/getting-started/run_full_cylc_workflow`.
9898

9999
.. code-block:: text
100100
101-
usage: cset extract-workflow [-h] location
101+
usage: cset extract-workflow [-h] [--restricted]
102+
[--restricted-url RESTRICTED_URL]
103+
location
102104
103105
positional arguments:
104-
location directory to save workflow into
106+
location directory to save workflow into
105107
106108
options:
107-
-h, --help show this help message and exit
109+
-h, --help show this help message and exit
110+
--restricted install restricted site-specific files during
111+
extraction
112+
--restricted-url RESTRICTED_URL
113+
Alternative Git URL to fetch the restricted files
114+
from. If omitted, defaults to trying to clone first
115+
from 'localmirrors:', then from GitHub via SSH and
116+
HTTPS.
117+
118+
cset install-restricted-files
119+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120+
121+
Download and install restricted site-specific files into the CSET workflow.
122+
123+
.. code-block:: text
124+
125+
usage: cset install-restricted-files [-h] [--restricted-url RESTRICTED_URL]
126+
location
127+
128+
positional arguments:
129+
location directory containing workflow
130+
131+
options:
132+
-h, --help show this help message and exit
133+
--restricted-url RESTRICTED_URL
134+
Alternative Git URL to fetch the restricted files
135+
from. If omitted, defaults to trying to clone first
136+
from 'localmirrors:', then from GitHub via SSH and
137+
HTTPS.

docs/source/usage/add-site.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ add your site file.
129129
If you would prefer to keep your site-specific configuration non-public, and are
130130
a Momentum Partnership member, we have a designated `CSET site-specific config
131131
repository`_ that contains these configurations for various Momentum Partners.
132-
It is this repository that is installed via the ``install_restricted_files.sh``
133-
script. Even when your file remains restricted like this you should still
132+
It is this repository that is installed via ``cset install-restricted-files``.
133+
Even when your file remains restricted like this you should still
134134
contribute your rose metadata changes to the `main CSET GitHub repository`_ so
135135
your site shows up as an option to users.
136136

0 commit comments

Comments
 (0)