9.13.2a0; support maci64 on maca64 under Rosetta

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.13.2
+$ python -m pip install matlabengine==9.13.2a0
 ```
 
 
@@ -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.13.2
+$ python -m pip install matlabengine==9.13.2a0
 ```
 
 ### 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.13.2
+$ python -m pip install matlabengine==9.13.2a0
 ```
 
 ---

setup.py

@@ -24,7 +24,7 @@ class _MatlabFinder(build_py):
     MATLAB_REL = 'R2022b'
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-    MATLAB_VER = '9.13.2'
+    MATLAB_VER = '9.13.2a0'
 
     # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
     SUPPORTED_PYTHON_VERSIONS = set(['3.8', '3.9', '3.10'])
@@ -82,6 +82,8 @@ def set_platform_and_arch(self):
             self.arch = 'glnxa64'
         elif self.platform == 'Darwin':
             if platform.mac_ver()[-1] == 'arm64':
+                # We will change this value later in the script if we find that the user is 
+                # using an installation of MATLAB built for maci64, to be run under Rosetta.
                 self.arch = 'maca64'
             else:
                 self.arch = 'maci64'
@@ -234,6 +236,10 @@ def search_path_for_directory_unix(self):
         dir_to_find = os.path.join('bin', self.arch)
         # directory could end with slashes
         endings = [dir_to_find, dir_to_find + os.sep]
+        if self.arch == 'maca64':
+            addl_dir_to_find = 'maci64'
+            endings.append(addl_dir_to_find)
+            endings.append(addl_dir_to_find + os.sep)
 
         matlab_root = ''
         dir_idx = 0
@@ -245,6 +251,13 @@ def search_path_for_directory_unix(self):
                 if path.endswith(ending):
                     # _get_matlab_root_from_unix_bin will return an empty string if MATLAB is not found.
                     # Non-empty string (MATLAB found) will break both loops.
+                    if self.arch == 'maca64' and ending[:6] == 'maci64':
+                        # We found a maci64 installation. Use it (under Rosetta) rather than maca64.
+                        # This means that if the user wants to use maci64 on a maca64 machine,
+                        # they need to make sure that the maci64 installation is in the default 
+                        # location if there is one, or if not, that it is earlier on the path than
+                        # any maca64 installations.
+                        self.arch = 'maci64'
                     matlab_root = self._get_matlab_root_from_unix_bin(path)
                 ending_idx += 1
             dir_idx += 1
@@ -308,7 +321,7 @@ def run(self):
     setup(
         name="matlabengine",
         # MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
-        version="9.13.2",
+        version="9.13.2a0",
         description='A module to call MATLAB from Python',
         author='MathWorks',
         license="MathWorks XSLA License",