Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Merge requests
!1684
fix default determination to handle symlinked casa installs
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
fix default determination to handle symlinked casa installs
fix-matrix-default-symlinks
into
2.8.4-DEVELOPMENT
Overview
3
Commits
2
Pipelines
2
Changes
1
All threads resolved!
Hide all comments
Merged
Charlotte Hausman
requested to merge
fix-matrix-default-symlinks
into
2.8.4-DEVELOPMENT
9 months ago
Overview
3
Commits
2
Pipelines
2
Changes
1
All threads resolved!
Hide all comments
Expand
This has been tested locally
Edited
9 months ago
by
Charlotte Hausman
0
0
Merge request reports
Compare
version 1
version 1
22f740cc
9 months ago
2.8.4-DEVELOPMENT (base)
and
latest version
latest version
e6c5eea6
2 commits,
9 months ago
version 1
22f740cc
1 commit,
9 months ago
Show latest version
1 file
+
3
−
12
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
shared/workspaces/workspaces/system/services/casa_matrix_service.py
+
3
−
12
Options
@@ -58,25 +58,16 @@ def casa_version_from_path(path: str) -> str:
# Defaults
casa_version
,
pipeline_version
=
"
unknown
"
,
"
default
"
def
check_regex
(
regex
:
str
,
path_str
:
str
)
->
re
.
Match
[
str
]
|
None
:
"""
check casa paths against version and pipeline regexes
:param regex:
:param path_str:
:return:
"""
return
re
.
search
(
regex
,
path_str
)
cv_search
=
check_regex
(
CASA_VERSION_REGEX
,
path
)
cv_search
=
re
.
search
(
CASA_VERSION_REGEX
,
path
)
if
cv_search
is
None
:
# this is probably a default link, make sure we use the actual version path
path2
=
pathlib
.
Path
(
path
)
if
path2
.
is_symlink
():
path
=
str
(
path2
.
readlink
())
cv_search
=
check_regex
(
CASA_VERSION_REGEX
,
path
)
cv_search
=
re
.
search
(
CASA_VERSION_REGEX
,
path
)
pv_search
=
check_regex
(
PIPELINE_VERSION_REGEX
,
path
)
pv_search
=
re
.
search
(
PIPELINE_VERSION_REGEX
,
path
)
if
cv_search
:
# Replace last '-' in the directory name with '.' to match versions stored in the database
Loading