Skip to content

Commit

Permalink
v0.9; correctly handle case where no MATLAB is installed
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathonw committed Mar 30, 2020
1 parent 8506b23 commit 2a5f261
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion matlab_proxy/matlab_proxy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def get_latest_matlab(reg_wow64):

m64 = get_latest_matlab(winreg.KEY_WOW64_64KEY)
m32 = get_latest_matlab(winreg.KEY_WOW64_32KEY)
if m64 is None and m32 is None:
if m64[0] is None and m32[0] is None:
return None
if matlab_version_cmp(m64[0], m32[0]) == 1 or (matlab_version_cmp(m64[0], m32[0]) == 0 and platform.architecture()[0] == '64bit'):
return ('64bit',) + m64
Expand Down
2 changes: 1 addition & 1 deletion matlab_proxy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

setup(
name="matlab_proxy",
version="0.8",
version="0.9",
packages=['matlab_proxy'],
include_package_data=True,
zip_safe=False,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
setup(
name="matlab_wrapper",
version="0.8",
version="0.9",
packages=find_packages(),
# FIXME do we need openmdao>=1.5.0,<2.0.0
install_requires=["openmdao==1.*", "smop>=0.23", "six>=1.10.0"]
Expand Down

0 comments on commit 2a5f261

Please sign in to comment.