Skip to content

Commit 6ca28e7

Browse files
Merge pull request #643 from oliver-sanders/8.2.x-sync
8.2.x sync
2 parents 71b3c79 + 2137151 commit 6ca28e7

File tree

10 files changed

+352
-196
lines changed

10 files changed

+352
-196
lines changed

.github/actions/install-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
libfontconfig1-dev \
2626
aspell-en
2727
28-
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169 # v2.1.1
28+
- uses: conda-incubator/setup-miniconda@3b0f2504dd76ef23b6d31f291f4913fb60ab5ff3 # v2.2.0
2929
with:
3030
channels: conda-forge
3131
python-version: ${{ matrix.python-version || '' }}

src/7-to-8/major-changes/ui.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ and as a multi user hub, ``cylc hub``. Both are dependent on `Cylc UI Server`_ i
4545
Launching the UI via the hub will require authentication.
4646
The default Authenticator uses PAM to authenticate system users with their
4747
username and password.
48-
Going via the hub unlocks the :ref:`Authorization` feature.
48+
49+
Going via the hub unlocks the ability to grant other users the permission
50+
to view and interact with workflows running under your account.
51+
Site administrators will need to configure this, for more information
52+
see :ref:`cylc.uiserver.multi-user`.
4953

5054
.. figure:: ../../img/hub.png
5155
:figwidth: 80%

src/conf.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,20 @@
110110
autosummary_imported_members = False
111111

112112
# Mapping to other Sphinx projects we want to import references from.
113+
# NOTE: To search available references, use:
114+
# $ python -m sphinx.ext.intersphinx <url>/objects.inv | less
113115
intersphinx_mapping = {
114116
'rose': (
115-
'http://metomi.github.io/rose/2.0.0/html', None
117+
'http://metomi.github.io/rose/2.1.0/html', None
116118
),
117119
'python': (
118120
'https://docs.python.org/3/', None
119121
),
120122
'jupyter_server': (
121123
'https://jupyter-server.readthedocs.io/en/latest/', None
124+
),
125+
'jupyter_hub': (
126+
'https://jupyterhub.readthedocs.io/en/stable/', None
122127
)
123128
}
124129

@@ -140,9 +145,11 @@
140145
graphviz_dot_args = ['-Gfontname=sans', '-Gbgcolor=none',
141146
'-Nfontname=sans']
142147

143-
linkcheck_anchors_ignore_for_url = [
148+
linkcheck_ignore = [
149+
# linux.die.net doesn't like our request headers
150+
'https?://linux.die.net/man/1/bash',
144151
# linkcheck has trouble handling GH anchors
145-
r'https://github.com/.*'
152+
'https?://github.com/.*#.*',
146153
]
147154

148155
nitpick_ignore_regex = [

src/dictionaries/words

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ arg
55
args
66
auth
77
authenticator
8+
authoriser
89
backticks
910
baz
1011
boolean
@@ -185,6 +186,7 @@ timeouts
185186
timestep
186187
timezone
187188
timezones
189+
uiserver
188190
unpaused
189191
unpausing
190192
untracked

src/reference/architecture/ui-server.rst

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,14 @@ spawns UI Servers on behalf of users and provides each with a fixed URL
9292
Users can access each other's UI Servers providing they have been granted
9393
permission.
9494

95-
Authorization is performed by Cylc within the `Cylc UI Server`_, see
96-
:ref:`cylc authorization`.
95+
*Authentication* is provided by either `Jupyter Server`_ or `Jupyter Hub`_.
96+
97+
*Authorization* in the `Cylc UI Server`_ is provided by Cylc. In
98+
multi-user mode this allows users to connect to each other's UI Servers for
99+
monitoring or control purposes.
100+
101+
For more information on security and configuration see
102+
:ref:`cylc.uiserver.multi-user`.
97103

98104
.. _Jupyter Hub technical overview: https://jupyterhub.readthedocs.io/en/stable/reference/technical-overview.html
99105

@@ -109,24 +115,3 @@ For information on the architecture of `Jupyter Hub`_ and the
109115

110116
.. image:: img/gui-arch-multi-user.svg
111117
:width: 100%
112-
113-
114-
.. _cylc authorization:
115-
116-
Authorization
117-
-------------
118-
119-
*Authentication* is provided by either `Jupyter Server`_ or `Jupyter Hub`_.
120-
121-
*Authorization* in the `Cylc UI Server`_ is provided by Cylc. In
122-
multi-user mode this allows users to connect to each others UI Servers for
123-
monitoring or control purposes.
124-
125-
See also :ref:`Authorization`.
126-
127-
.. note::
128-
129-
This authorization only applies to the ``/cylc`` endpoints managed by the
130-
Cylc extension. Other `Jupyter Server`_ extensions such as `Jupyter Lab`_
131-
do not share this authorization and will not be accessible to other users
132-
(unless they can be configured to allow this).

src/reference/changes.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,36 @@ For more detail see the component changelogs:
2020
* `metomi-rose-changelog`_
2121
* `metomi-isodatetime-changelog`_
2222

23+
24+
----------
25+
26+
Cylc 8.3.0
27+
----------
28+
29+
.. admonition:: Cylc Components
30+
:class: hint
31+
32+
TODO
33+
34+
..
35+
Uncomment this before 8.3.0 release
36+
37+
:cylc-flow: `8.3 <https://github.com/cylc/cylc-flow/blob/8.3.x/CHANGES.md>`__
38+
:cylc-uiserver: `1.4 <https://github.com/cylc/cylc-uiserver/blob/1.4.x/CHANGES.md>`__
39+
:cylc-rose: `1.4 <https://github.com/cylc/cylc-rose/blob/1.4.x/CHANGES.md>`__
40+
41+
42+
Upgrade To The Latest Jupyter Releases
43+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44+
45+
The Cylc UI Server has been updated to work with the latest releases of
46+
`Jupyter Server`_ and `Jupyter Hub`_.
47+
48+
If you are utilising Cylc's multi-user functionality then your configuration
49+
will require some changes to work with these releases.
50+
51+
See :ref:`cylc.uiserver.multi-user` for more details
52+
2353
----------
2454

2555
Cylc 8.2.0

src/tutorial/runtime/runtime-configuration.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,16 @@ Start, Stop, Restart
367367
368368
.. TODO: Add advice on what to do if the command fails.
369369
370-
#. **Test The** ``get_observations`` **Tasks.**
370+
#. **Test the** ``get_observations`` **tasks.**
371371

372372
Next we will test the ``get_observations`` tasks.
373373

374+
Install the workflow:
375+
376+
.. code-block:: bash
377+
378+
cylc install
379+
374380
Open a user interface (:ref:`tutorial.tui` or :ref:`tutorial.gui`) to view
375381
your workflow.
376382

@@ -429,6 +435,7 @@ Start, Stop, Restart
429435
.. code-block:: bash
430436
431437
cylc validate .
438+
cylc install
432439
433440
.. TODO: Add advice on what to do if the command fails.
434441

src/user-guide/installing-workflows.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ The run directory now looks as follows:
402402

403403
If your workflow needs to create or install scripts or executables at runtime
404404
and you don't want Cylc to delete them on re-installation, you can use
405-
``bin`` and ``lib/python`` directories in the :ref:` workflow share directory <workflow_share_directories>`.
405+
``bin`` and ``lib/python`` directories in the
406+
:ref:`workflow share directory<workflow_share_directories>`.
406407

407408

408409
Expected Errors

0 commit comments

Comments
 (0)