version_atleast more efficent, numeric only

Author: scivision

+stdlib/python_version.m

@@ -2,7 +2,11 @@
 
 function v = python_version()
 
-pe = pyenv();
-v = pe.Version;
+try
+  pe = pyenv();
+  v = pe.Version;
+catch
+  v = "";
+end
 
 end

+stdlib/relative_to.m

@@ -47,7 +47,7 @@
 ois = stdlib.is_absolute(other);
 
 if bis ~= ois
-  rel = ""; 
+  rel = "";
   return
 end
 
@@ -68,7 +68,7 @@
 
 try
   bp = py.pathlib.Path(other);
-  if stdlib.python_version() >= "3.12"
+  if stdlib.version_atleast(stdlib.python_version(), "3.12")
     r = bp.relative_to(base, pyargs(walk_up=true));
   else
     r = bp.relative_to(base);

+stdlib/version_atleast.m

@@ -1,6 +1,6 @@
 %% VERSION_ATLEAST compare two string verions: major.minor.rev.patch
 % compare two string verions: major.minor.rev.patch
-% uses strings to compare so mixed number/string is OK
+% numeric portions only.
 %
 %% Inputs
 % * in: version to examine (string)
@@ -10,8 +10,8 @@
 
 function r = version_atleast(in, ref)
 arguments
-  in (1,1) string
-  ref (1,1) string
+  in {mustBeTextScalar}
+  ref {mustBeTextScalar}
 end
 
 
@@ -20,51 +20,27 @@
   return
 end
 
-inp = split(in, ' ');
-in_str = split(inp(1), ".");
+parts1 = str2double(strsplit(in, '.'));
+parts2 = str2double(strsplit(ref, '.'));
 
-refp = split(ref, ' ');
-ref_str = split(refp(1), ".");
+r = true;
 
-% Compare numeric parts first
-for i = 1:min(length(in_str), length(ref_str))
-  in_num = double(in_str(i));
-  ref_num = double(ref_str(i));
-
-  if isnan(in_num) || isnan(ref_num)
-    % assume values are leading integer with trailing string
-    % extract integer part and compare
-    in_num = double(regexp(in_str(i), "\d+", "match", "once"));
-    ref_num = double(regexp(ref_str(i), "\d+", "match", "once"));
-
-    if isnan(in_num) || isnan(ref_num) || in_num == ref_num
-      % compare string parts
-      in_str_part = regexp(in_str(i), "\D+", "match", "once");
-      ref_str_part = regexp(ref_str(i), "\D+", "match", "once");
-      if in_str_part > ref_str_part
-        r = true;
-        return
-      elseif in_str_part < ref_str_part
-        r = false;
-        return
-      end
-
-      continue
-    end
-  end
-
-  % Compare numerically
-  if in_num > ref_num
-    r = true;
-    return
-  elseif in_num < ref_num
+for i = 1:min(length(parts1), length(parts2))
+  if parts1(i) < parts2(i)
     r = false;
     return
+  elseif parts1(i) > parts2(i)
+    return
   end
 end
 
-% If all compared parts are equal, compare lengths
-r = length(in_str) >= length(ref_str);
+% If all common parts are equal, check for longer versions
+% If "ref" is longer and its remaining parts are not all zeros, then "in" is less.
+if length(parts1) < length(parts2)
+  if any(parts2(length(parts1)+1:end) > 0)
+    r = false;
+  end
+end
 
 end
 

test/TestRelative.m

@@ -37,7 +37,7 @@ function test_proximate_to(tc, pp)
 };
 % NOTE: ".." in relative_to(base) is ambiguous including for python.pathlib, C++ <filesystem>, etc.
 
-if stdlib.has_dotnet() || stdlib.python_version() >= "3.12"
+if stdlib.has_dotnet() || stdlib.version_atleast(stdlib.python_version(), "3.12")
 p = [p, {
 {"a/b/c/d", "a/b", fullfile("..", "..")}, ...
 {"a/b", "a/c", fullfile("..", "c")}, ...
@@ -49,7 +49,7 @@ function test_proximate_to(tc, pp)
 
 if ispc
 
-if stdlib.has_dotnet() || stdlib.python_version() >= "3.12"
+if stdlib.has_dotnet() || stdlib.version_atleast(stdlib.python_version(), "3.12")
 p = [p, { ...
 {"C:/a/b", "C:/", fullfile("..", "..")}, ...
 {"c:/a/b", "c:/a", ".."}, ...

test/TestSys.m

@@ -20,13 +20,13 @@ function test_platform_int32(tc, fi32)
 function test_dotnet_version(tc)
 tc.assumeTrue(stdlib.has_dotnet())
 v = stdlib.dotnet_version();
-tc.verifyGreaterThan(v, "4.0", ".NET version should be greater than 4.0")
+tc.verifyTrue(stdlib.version_atleast(v, "4.0"), ".NET version should be greater than 4.0")
 end
 
 function test_has_python(tc)
 tc.assumeTrue(stdlib.has_python())
 v = stdlib.python_version();
-tc.verifyGreaterThan(strlength(v), 0, "expected non-empty Python version")
+tc.verifyTrue(stdlib.version_atleast(v, "3.8"), "expected Python >= 3.8")
 end
 
 function test_os_version(tc)

test/TestVersion.m

@@ -5,10 +5,7 @@
     {"3.19.0.33", "3.19.0", true}, ...
     {"3.19.0.33", "3.19.0.34", false}, ...
     {"1.5.0.3", "1.5.0", true}, ...
-    {"1.5.0", "1.5.0.3", false}, ...
-    {"11.5.1a", "11.5.1b", false}, ...
-    {"1.13a", "1.2c", true}, ...
-    {"1.2c", "1.13b", false}, ...
+    {"1.5.0", "1.5.0.3", false}
     }
 end