Skip to content

Commit c1ea34f

Browse files
committed
FIX: Adjust RMS 14.5 handling for 14.5.0.1
1 parent be94262 commit c1ea34f

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/runrms/config/_rms_config.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,12 @@ def _resolve_version(
6565
)
6666
if rms_project:
6767
if rms_project.master.version in site_config.versions:
68-
# Handle RMS 14.5 specially as it stores no patch version whatsoever,
69-
# whereas RMS 14.2 at least stored it via rmsapi. This is technically RMS
70-
# 14.5.0 but RMS is currently unable to provide consistent versioning.
71-
if rms_project.master.version == "14.5":
72-
return rms_project.master.version
73-
7468
master_version = version_parse(rms_project.master.version)
75-
major, minor, patch = master_version.release
69+
major = master_version.major
70+
minor = master_version.minor
7671

77-
# Handle RMS 14 specially as it stores no patch version internally.
78-
if major == 14:
72+
# Handle RMS 14.2 specially as it stores no patch version internally.
73+
if major == 14 and minor <= 2:
7974
newest_patch = site_config.get_newest_patch_version(major, minor)
8075
return f"{major}.{minor}.{newest_patch}"
8176

src/runrms/config/runrms.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,9 @@ versions:
4444
RMS_PLUGINS_LIBRARY: /opt/rms/14.5/site/plugins
4545
TCL_LIBRARY: /opt/rms/14.5/lib/tcl8.6
4646
TK_LIBRARY: /opt/rms/14.5/lib/tcl8.6
47+
14.5.0.1:
48+
env:
49+
PYTHONPATH: /opt/rms/14.5.0.1/site/lib/python3.11/site-packages
50+
RMS_PLUGINS_LIBRARY: /opt/rms/14.5.0.1/site/plugins
51+
TCL_LIBRARY: /opt/rms/14.5.0.1/lib/tcl8.6
52+
TK_LIBRARY: /opt/rms/14.5.0.1/lib/tcl8.6

tests/test_rms_config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def test_resolve_version(default_config_file: dict[str, Any]) -> None:
3232
site_config = SiteConfig.model_validate(default_config_file)
3333
assert _resolve_version("14.2.1", site_config, None) == "14.2.1"
3434
assert _resolve_version("14.5", site_config, None) == "14.5"
35+
assert _resolve_version("14.5.0.1", site_config, None) == "14.5.0.1"
3536
assert _resolve_version(None, site_config, None) == "14.2.2"
3637

3738
with pytest.raises(
@@ -211,6 +212,7 @@ def test_rmsconfig_get_env(
211212
("14.2.2", "V14.2", "14.2.2"),
212213
("14.2.1", "V14.2", "14.2.2"),
213214
("14.5", "V14.5", "14.5"),
215+
("14.5.0.1", "V14.5.0.1", "14.5.0.1"),
214216
],
215217
)
216218
def test_rmsconfig_with_v14_from_master_resolves_to_latest_patch(

0 commit comments

Comments
 (0)