Skip to content

Commit 20e98ea

Browse files
committed
9.13.3a1; reworded comments
1 parent 2cec6d2 commit 20e98ea

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The MATLAB® Engine API for Python® provides a package to integrate MATLA
2121
MATLAB Engine API for Python can be installed directly from the Python Package Index.
2222
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
2323
```bash
24-
$ python -m pip install matlabengine==9.13.2a0
24+
$ python -m pip install matlabengine==9.13.3a1
2525
```
2626

2727

@@ -46,7 +46,7 @@ setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:<matlabroot>/bin/glnxa64
4646
MATLAB Engine API for Python can be installed directly from the Python Package Index.
4747
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
4848
```bash
49-
$ python -m pip install matlabengine==9.13.2a0
49+
$ python -m pip install matlabengine==9.13.3a1
5050
```
5151

5252
### macOS
@@ -70,7 +70,7 @@ setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:<matlabroot>/bin/maci64
7070
MATLAB Engine API for Python can be installed directly from the Python Package Index.
7171
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
7272
```bash
73-
$ python -m pip install matlabengine==9.13.2a0
73+
$ python -m pip install matlabengine==9.13.3a1
7474
```
7575

7676
---

setup.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class _MatlabFinder(build_py):
2424
MATLAB_REL = 'R2022b'
2525

2626
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
27-
MATLAB_VER = '9.13.2a0'
27+
MATLAB_VER = '9.13.3a1'
2828

2929
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
3030
SUPPORTED_PYTHON_VERSIONS = set(['3.8', '3.9', '3.10'])
@@ -82,8 +82,8 @@ def set_platform_and_arch(self):
8282
self.arch = 'glnxa64'
8383
elif self.platform == 'Darwin':
8484
if platform.mac_ver()[-1] == 'arm64':
85-
# We will change this value later in the script if we find that the user is
86-
# using an installation of MATLAB built for maci64, to be run under Rosetta.
85+
# This value will be changed later in the script if a maci64 MATLAB
86+
# installation, to be run under Rosetta, is encountered.
8787
self.arch = 'maca64'
8888
else:
8989
self.arch = 'maci64'
@@ -209,7 +209,7 @@ def _check_matlab_ver_against_engine(self, matlab_ver):
209209

210210
def verify_matlab_release(self, root):
211211
"""
212-
Parses VersionInfo.xml to verify the MATLAB release matches the supported release
212+
Parses VersionInfo.xml to verify that the MATLAB release matches the supported release
213213
for the Python Engine.
214214
"""
215215
version_info = os.path.join(root, 'VersionInfo.xml')
@@ -252,11 +252,13 @@ def search_path_for_directory_unix(self):
252252
# _get_matlab_root_from_unix_bin will return an empty string if MATLAB is not found.
253253
# Non-empty string (MATLAB found) will break both loops.
254254
if self.arch == 'maca64' and ending[:6] == 'maci64':
255-
# We found a maci64 installation. Use it (under Rosetta) rather than maca64.
256-
# This means that if the user wants to use maci64 on a maca64 machine,
257-
# they need to make sure that the maci64 installation is in the default
258-
# location if there is one, or if not, that it is earlier on the path than
259-
# any maca64 installations.
255+
# Found a maci64 installation to be used under Rosetta.
256+
# To use maci64 on a maca64 machine, one of the following must be true:
257+
# (1) there must be a maci64 installation in the default location
258+
# (see DEFAULT_INSTALLS), or
259+
# (2) there must be no Mac installation in the default location
260+
# and the maci64 installation must be earlier on DYLD_LIBRARY_PATH
261+
# than any maca64 installation.
260262
self.arch = 'maci64'
261263
matlab_root = self._get_matlab_root_from_unix_bin(path)
262264
ending_idx += 1
@@ -266,8 +268,8 @@ def search_path_for_directory_unix(self):
266268
if self.found_matlab:
267269
if self.found_matlab in self.VER_TO_REL:
268270
raise RuntimeError(self.incompatible_ver.format(ver=self.VER_TO_REL[self.found_matlab], found=self.found_matlab))
269-
# We found a MATLAB release but it is older than the oldest version we support,
270-
# or newer than the newest version we support.
271+
# Found a MATLAB release but it is older than the oldest version supported,
272+
# or newer than the newest version supported.
271273
else:
272274
v_to_r_keys = list(self.VER_TO_REL.keys())
273275
min_v = v_to_r_keys[0]
@@ -321,7 +323,7 @@ def run(self):
321323
setup(
322324
name="matlabengine",
323325
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
324-
version="9.13.2a0",
326+
version="9.13.3a1",
325327
description='A module to call MATLAB from Python',
326328
author='MathWorks',
327329
license="MathWorks XSLA License",

0 commit comments

Comments
 (0)