9.12.5; setup.py logic now matches the R2021b logic where appropriate

Author: alanfmw

README.md

@@ -21,7 +21,7 @@ The MATLAB® Engine API for Python® provides a package to integrate MATLA
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.12
+$ python -m pip install matlabengine==9.12.5
 ```
 
 
@@ -46,7 +46,7 @@ setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:matlabroot/bin/glnxa64
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.12
+$ python -m pip install matlabengine==9.12.5
 ```
 
 ### macOS
@@ -70,7 +70,7 @@ setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:matlabroot/bin/maci64
 MATLAB Engine API for Python can be installed directly from the Python Package Index.
 <!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
 ```bash
-$ python -m pip install matlabengine==9.12
+$ python -m pip install matlabengine==9.12.5
 ```
 
 ---

setup.py

@@ -3,6 +3,7 @@
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py 
 import os
+import re
 import sys
 import platform
 import xml.etree.ElementTree as xml
@@ -23,7 +24,7 @@ class _MatlabFinder(build_py):
     MATLAB_REL = 'R2022a'
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-    MATLAB_VER = '9.12.4' 
+    MATLAB_VER = '9.12.5' 
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
     SUPPORTED_PYTHON_VERSIONS = set(['3.8', '3.9'])
@@ -36,7 +37,7 @@ class _MatlabFinder(build_py):
         "9.9": "R2020b",
         "9.10": "R2021a",
         "9.11": "R2021b",
-        "9.12.4": "R2022a"
+        "9.12": "R2022a"
     }
 
     DEFAULT_INSTALLS = {
@@ -63,6 +64,8 @@ class _MatlabFinder(build_py):
     no_matlab = "No MATLAB installation found in Windows Registry."
     incompatible_ver = "MATLAB version {ver:s} was found, but MATLAB Engine API for Python is not compatible with it. " + \
         "To install a compatible version, call python -m pip install matlabengine=={found:s}."
+    invalid_version_from_matlab_ver = "Format of MATLAB version '{ver:s}' is invalid."
+    invalid_version_from_eng = "Format of MATLAB Engine API version '{ver:s}' is invalid."
 
     def set_platform_and_arch(self):
         """
@@ -171,7 +174,7 @@ def _find_matlab_key_from_windows_registry(self, key):
             found_vers.append(sub_key)
             # Example: the version in the registry could be "9.13.1" whereas our version is "9.13"
             # we still want to allow this
-            if sub_key.startswith(self.MATLAB_VER):
+            if self._check_matlab_ver_against_engine(sub_key):
                 key_value = sub_key
                 break
 
@@ -184,10 +187,25 @@ def _find_matlab_key_from_windows_registry(self, key):
 
         return key_value       
 
+    def _check_matlab_ver_against_engine(self, matlab_ver):
+        re_major_minor = "^(\d+)\.(\d+)"
+        matlab_ver_match = re.match(re_major_minor, matlab_ver)
+        if not matlab_ver_match:
+            raise RuntimeError(f"{self.invalid_version_from_matlab_ver.format(ver=matlab_ver)}")
+        eng_match = re.match(re_major_minor, self.MATLAB_VER)
+        if not eng_match:
+            raise RuntimeError(f"{self.invalid_version_from_eng.format(ver=self.MATLAB_VER)}")
+        
+        matlab_ver_major_minor = (matlab_ver_match.group(1), matlab_ver_match.group(2))
+        eng_major_minor = (eng_match.group(1), eng_match.group(2))
+        
+        return (matlab_ver_major_minor == eng_major_minor)
+    
     def verify_matlab_release(self, root):
         """
         Parses VersionInfo.xml to verify the MATLAB release matches the supported release
-        for the Python Engine.
+        for the Python Engine. The major and minor version numbers must match. Everything
+        else will be ignored.
         """
         version_info = os.path.join(root, 'VersionInfo.xml')
         if not os.path.isfile(version_info):
@@ -201,10 +219,7 @@ def verify_matlab_release(self, root):
             if child.tag == 'release':
                 matlab_release = self.found_matlab = child.text
                 break
-        
-        if matlab_release != self.MATLAB_REL:
-            return False
-        return True
+        return matlab_release == self.MATLAB_REL
 
     def search_path_for_directory_unix(self):
         """
@@ -284,7 +299,7 @@ def run(self):
     setup(
         name="matlabengine",
         # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-        version="9.12.4",
+        version="9.12.5",
         description='A module to call MATLAB from Python',
         author='MathWorks',
         license="MathWorks XSLA License",