Skip to content

Commit 4014feb

Browse files
committed
26.1.10
1 parent d2d21c0 commit 4014feb

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

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==26.1.9
24+
$ python -m pip install matlabengine==26.1.10
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==26.1.9
49+
$ python -m pip install matlabengine==26.1.10
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==26.1.9
73+
$ python -m pip install matlabengine==26.1.10
7474
```
7575

7676
---

setup.py

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

2626
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
27-
MATLAB_VER = '26.1.9'
27+
MATLAB_VER = '26.1.10'
2828

2929
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
3030
SUPPORTED_PYTHON_VERSIONS = set(['3.9', '3.10', '3.11', '3.12', '3.13'])
@@ -58,7 +58,7 @@ class _MatlabFinder(build_py):
5858
found_matlab_version = ''
5959
found_matlab_with_wrong_arch_in_default_install = ''
6060
found_matlab_with_wrong_arch_in_path = ''
61-
verbose = False
61+
verbose = True
6262

6363
# ERROR MESSAGES
6464
minimum_maximum = "No compatible version of MATLAB was found. " + \
@@ -105,6 +105,8 @@ def set_platform_and_arch(self):
105105
self.arch = 'maci64'
106106
else:
107107
raise RuntimeError(self.unsupported_platform.format(platform=self.platform))
108+
109+
self._print_if_verbose(f'{self.platform=}; {self.path_env_var_name=}; {self.arch=}')
108110

109111
def set_python_version(self):
110112
"""
@@ -115,19 +117,25 @@ def set_python_version(self):
115117

116118
if self.python_ver not in self.SUPPORTED_PYTHON_VERSIONS:
117119
raise RuntimeError(self.unsupported_python.format(python=self.python_ver, supported=str(self.SUPPORTED_PYTHON_VERSIONS)))
120+
121+
self._print_if_verbose(f'{self.python_ver=}')
118122

119123
def unix_default_install_exists(self):
120124
"""
121125
Determines whether MATLAB is installed in default UNIX location.
122126
"""
123127
path = self.DEFAULT_INSTALLS[self.platform]
128+
self._print_if_verbose(f'From unix_default_install_exists: {self.platform=}; {path=}')
129+
self._print_if_verbose(f'{os.path.exists(path)=}')
124130
if not os.path.exists(path):
125131
return False
126132

127133
if self.platform == 'Darwin':
128134
# On Mac, we need to further verify that there is a 'bin/maci64' subdir if the Python is maci64
129135
# or a 'bin/maca64' subdir if the Python is maca64.
130136
path_to_bin = os.path.join(path, 'bin', self.arch)
137+
self._print_if_verbose(f'From unix_default_install_exists: {path_to_bin=}')
138+
self._print_if_verbose(f'{os.path.exists(path_to_bin)=}')
131139
if os.path.exists(path_to_bin):
132140
# The path exists, and we don't need to do anything further.
133141
return True
@@ -144,6 +152,7 @@ def unix_default_install_exists(self):
144152
# location that has the wrong arch. The user can choose whether to change the
145153
# Python interpreter or the MATLAB installation so that the arch will match.
146154
self.found_matlab_with_wrong_arch_in_default_install = path
155+
self._print_if_verbose(f'{self.found_matlab_with_wrong_arch_in_default_install}')
147156
return False
148157

149158
return True
@@ -157,6 +166,7 @@ def _create_path_list(self):
157166
if self.path_env_var_name in os.environ:
158167
path_string = os.environ[self.path_env_var_name]
159168
path_dirs.extend(path_string.split(os.pathsep))
169+
self._print_if_verbose(f'{path_dirs=}')
160170

161171
if not path_dirs:
162172
raise RuntimeError(self.install_or_set_path.format(
@@ -285,6 +295,7 @@ def _check_matlab_ver_against_engine(self, matlab_ver):
285295
raise RuntimeError(f"{self.invalid_version_from_matlab_ver.format(ver=matlab_ver)}")
286296
eng_major_minor = self._get_engine_ver_major_minor(self.MATLAB_VER)
287297
matlab_ver_major_minor = (matlab_ver_match.group(1), matlab_ver_match.group(2))
298+
self._print_if_verbose(f'{matlab_ver_major_minor=}; {eng_major_minor=}')
288299
return (matlab_ver_major_minor == eng_major_minor)
289300

290301
def verify_matlab_release(self, root):
@@ -306,6 +317,7 @@ def verify_matlab_release(self, root):
306317
elif child.tag == 'version':
307318
major, minor = self._get_engine_ver_major_minor(child.text)
308319
self.found_matlab_version = f'{major}.{minor}'
320+
self._print_if_verbose(f'{matlab_release=}; {self.MATLAB_REL=}')
309321
return matlab_release == self.MATLAB_REL
310322

311323
def search_path_for_directory_unix(self, arch, path_dirs):
@@ -374,6 +386,7 @@ def write_text_file(self, matlab_root):
374386
root_file.write(bin_arch + '\n')
375387
root_file.write(engine_arch + '\n')
376388
root_file.write(extern_bin)
389+
self._print_if_verbose(f'{file_location=}; {bin_arch=}; {engine_arch=}; {extern_bin=}')
377390

378391
def run(self):
379392
"""
@@ -422,7 +435,7 @@ def run(self):
422435
setup(
423436
name="matlabengine",
424437
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
425-
version="26.1.9",
438+
version="26.1.10",
426439
description='A module to call MATLAB from Python',
427440
author='MathWorks',
428441
license="LICENSE.txt, located in this repository",

0 commit comments

Comments
 (0)