Skip to content

Commit

Permalink
simplify where data is stored
Browse files Browse the repository at this point in the history
  • Loading branch information
wxtim committed Jun 27, 2024
1 parent b09005a commit 5aa9b5a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
6 changes: 3 additions & 3 deletions cylc/flow/pathutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
SHELL_ENV_VARS = re.compile(r'\$[^$/]*')
SYMLINKABLE_LOCATIONS: Dict[str, str] = {
# Location: Version Added
'log': '8.0.0',
'log/job': '8.4.0',
'share': '8.0.0',
'share/cycle': '8.0.0',
'share': '8.0.0',
'log/job': '8.4.0',
'log': '8.0.0',
'work': '8.0.0'
}

Expand Down
10 changes: 2 additions & 8 deletions cylc/flow/workflow_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
is_remote_host,
)
from cylc.flow.pathutil import (
SYMLINKABLE_LOCATIONS,
expand_path,
get_cylc_run_dir,
get_workflow_run_dir,
Expand Down Expand Up @@ -203,11 +204,6 @@ class LogDir:
DB = 'db'
"""The public database"""

JOB = 'job'
"""The job log directory."""

LOG_JOB_DIR = os.path.join(LogDir.DIRNAME, LogDir.JOB)

SHARE_DIR = 'share'
"""Workflow share directory."""

Expand Down Expand Up @@ -263,9 +259,7 @@ class Install:
RESERVED_NAMES = frozenset([FLOW_FILE, SUITE_RC, *RESERVED_DIRNAMES])
"""Reserved filenames that cannot be used as run names."""

SYMLINK_DIRS = frozenset([
SHARE_CYCLE_DIR, SHARE_DIR, LogDir.DIRNAME, LOG_JOB_DIR, WORK_DIR, ''
])
SYMLINK_DIRS = frozenset(list(SYMLINKABLE_LOCATIONS.keys()) + [''])
"""The paths of the symlink dirs that may be set in
global.cylc[install][symlink dirs], relative to the run dir
('' represents the run dir)."""
Expand Down

0 comments on commit 5aa9b5a

Please sign in to comment.