Skip to content

Commit 33ca959

Browse files
committed
initial version of R2020b; version number is 9.9.1a0
1 parent d6e13a3 commit 33ca959

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ The MATLAB® Engine API for Python® provides a package to integrate MATLA
66
## Requirements
77
### Required MathWorks Products
88
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
9-
* MATLAB release R2021a
9+
* MATLAB release R2020b
1010

1111
### Required 3rd Party Products
1212
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
13-
* Python 3.7 or 3.8
13+
* Python 3.6, 3.7, or 3.8
1414
* Supported Python versions by MATLAB release can be found [here](https://www.mathworks.com/content/dam/mathworks/mathworks-dot-com/support/sysreq/files/python-compatibility.pdf).
1515

1616
---
@@ -21,15 +21,15 @@ The MATLAB&reg; Engine API for Python&reg; 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.10.1a1
24+
$ python -m pip install matlabengine==9.9.1a0
2525
```
2626

2727

2828

2929
### Linux&reg;
3030
Prior to installation, check the default install location of MATLAB by calling ```matlabroot``` in a MATLAB Command Window. By default, Linux installs MATLAB at:<br>
3131
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
32-
```/usr/local/MATLAB/R2021a```
32+
```/usr/local/MATLAB/R2020b```
3333

3434
When MATLAB is not installed in the default location, the bin/*architecture* directory within the MATLAB root directory must be added to an environment variable. The path can be added to the environment variable within the shell startup configuration file (for example, .bashrc for bash shell or .tcshrc for tcsh).
3535

@@ -46,14 +46,14 @@ 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.10.1a1
49+
$ python -m pip install matlabengine==9.9.1a0
5050
```
5151

5252
### macOS
5353
Prior to installation, check the default install location of MATLAB by calling ```matlabroot``` in a MATLAB Command Window. By default, macOS installs MATLAB at:<br>
5454

5555
<!-- MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string) -->
56-
```/Applications/MATLAB_R2021a.app```
56+
```/Applications/MATLAB_R2020b.app```
5757

5858
When MATLAB is not installed in the default location, the bin/*architecture* directory within the MATLAB root directory must be added to an environment variable. The path can be added to the environment variable within the shell startup configuration file (for example, .bashrc for bash shell or .tcshrc for tcsh).
5959

@@ -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.10.1a1
73+
$ python -m pip install matlabengine==9.9.1a0
7474
```
7575

7676
---

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class _MatlabFinder(build_py):
2121
}
2222

2323
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
24-
MATLAB_REL = 'R2021a'
24+
MATLAB_REL = 'R2020b'
2525

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

2929
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
30-
SUPPORTED_PYTHON_VERSIONS = set(['3.7', '3.8'])
30+
SUPPORTED_PYTHON_VERSIONS = set(['3.6', '3.7', '3.8'])
3131

3232
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
3333
VER_TO_REL = {
@@ -303,7 +303,7 @@ def run(self):
303303
setup(
304304
name="matlabengine",
305305
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
306-
version="9.10.1a1",
306+
version="9.9.1a0",
307307
description='A module to call MATLAB from Python',
308308
author='MathWorks',
309309
license="MathWorks XSLA License",
@@ -328,9 +328,10 @@ def run(self):
328328
"Natural Language :: English",
329329
"Intended Audience :: Developers",
330330
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
331+
"Programming Language :: Python :: 3.6",
331332
"Programming Language :: Python :: 3.7",
332333
"Programming Language :: Python :: 3.8"
333334
],
334335
# MUST_BE_UPDATED_EACH_RELEASE (Search repo for this string)
335-
python_requires=">=3.7, <3.9"
336+
python_requires=">=3.6, <3.9"
336337
)

src/matlab/engine/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
# UPDATE_IF_PYTHON_VERSION_ADDED_OR_REMOVED : search for this string in codebase
3030
# when support for a Python version must be added or removed
31-
_supported_versions = ['2_7', '3_7', '3_8']
31+
_supported_versions = ['3_6', '3_7', '3_8']
3232
_ver = sys.version_info
3333
_version = '{0}_{1}'.format(_ver[0], _ver[1])
3434
_PYTHONVERSION = None
@@ -39,24 +39,23 @@
3939
raise EnvironmentError("Python %s is not supported." % _version)
4040

4141
_module_folder = os.path.dirname(os.path.realpath(__file__))
42-
_arch_filename = os.path.join(_module_folder, "_arch.txt")
42+
_arch_filename = _module_folder+os.sep+"_arch.txt"
4343

4444
try:
4545
pythonengine = importlib.import_module("matlabengineforpython"+_PYTHONVERSION)
4646
except:
4747
try:
4848
_arch_file = open(_arch_filename,'r')
4949
_lines = _arch_file.readlines()
50-
[_arch, _bin_dir,_engine_dir, _extern_bin_dir] = [x.rstrip() for x in _lines if x.rstrip() != ""]
50+
[_arch, _bin_dir,_engine_dir] = [x.rstrip() for x in _lines if x.rstrip() != ""]
5151
_arch_file.close()
5252
sys.path.insert(0,_engine_dir)
53-
sys.path.insert(0,_extern_bin_dir)
5453

5554
_envs = {'win32': 'PATH', 'win64': 'PATH'}
5655
if _arch in _envs:
5756
if _envs[_arch] in os.environ:
5857
_env = os.environ[_envs[_arch]]
59-
os.environ[_envs[_arch]] = _bin_dir + os.pathsep + os.environ[_envs[_arch]]
58+
os.environ[_envs[_arch]] = _bin_dir+os.pathsep+os.environ[_envs[_arch]]
6059
else:
6160
os.environ[_envs[_arch]] = _bin_dir
6261
if sys.version_info.major >= 3 and sys.version_info.minor >= 8:

0 commit comments

Comments
 (0)