Merge pull request #5900 from cylc/8.2.x-sync

🤖 Merge 8.2.x-sync into master

Author: oliver-sanders

README.md

@@ -95,7 +95,7 @@ Quick summary of major changes:
 
 [![License](https://img.shields.io/github/license/cylc/cylc-flow.svg?color=lightgrey)](https://github.com/cylc/cylc-flow/blob/master/COPYING)
 
-Copyright (C) 2008-<span actions:bind='current-year'>2023</span> NIWA & British Crown (Met Office) & Contributors.
+Copyright (C) 2008-<span actions:bind='current-year'>2024</span> NIWA & British Crown (Met Office) & Contributors.
 
 Cylc is free software: you can redistribute it and/or modify it under the terms
 of the GNU General Public License as published by the Free Software Foundation,

cylc/flow/id_cli.py

@@ -104,12 +104,14 @@ def _parse_cli(*ids: str) -> List[Tokens]:
         >>> parse_back('//cycle')
         Traceback (most recent call last):
         InputError: Relative reference must follow an incomplete one.
-        E.G: workflow //cycle/task
 
         >>> parse_back('workflow//cycle', '//cycle')
         Traceback (most recent call last):
         InputError: Relative reference must follow an incomplete one.
-        E.G: workflow //cycle/task
+
+        >>> parse_back('workflow///cycle/')
+        Traceback (most recent call last):
+        InputError: Invalid ID: workflow///cycle/
 
     """
     # upgrade legacy ids if required
@@ -125,7 +127,11 @@ def _parse_cli(*ids: str) -> List[Tokens]:
             if id_.endswith('/') and not id_.endswith('//'):  # noqa: SIM106
                 # tolerate IDs that end in a single slash on the CLI
                 # (e.g. CLI auto completion)
-                tokens = Tokens(id_[:-1])
+                try:
+                    # this ID is invalid with or without the trailing slash
+                    tokens = Tokens(id_[:-1])
+                except ValueError:
+                    raise InputError(f'Invalid ID: {id_}')
             else:
                 raise InputError(f'Invalid ID: {id_}')
         is_partial = tokens.get('workflow') and not tokens.get('cycle')

cylc/flow/scripts/__init__.py

@@ -14,4 +14,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-_copyright_year = 2023  # This is set by GH Actions update_copyright workflow
+_copyright_year = 2024  # This is set by GH Actions update_copyright workflow