Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: compatible with sympy 1.6(#1023) #1028

Merged
merged 1 commit into from
Oct 16, 2021
Merged

fix: compatible with sympy 1.6(#1023) #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inst/private/check_and_convert.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

sp = py.sympy;
_sym = py.tuple({sp.Basic, sp.MatrixBase});
string_types = sp.compatibility.string_types;
integer_types = sp.compatibility.integer_types;
string_types = py.str;
integer_types = py.int;
end


Expand Down
6 changes: 4 additions & 2 deletions inst/private/python_header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ def octoutput(x, et):
c = ET.SubElement(et, "list")
for y in x:
octoutput(y, c)
elif isinstance(x, sp.compatibility.integer_types):
elif isinstance(x, int) or \
(sys.version_info[0] <= 2 and isinstance(x, long)):
a = ET.SubElement(et, "item")
f = ET.SubElement(a, "f")
f.text = str(OCTCODE_INT)
Expand All @@ -205,7 +206,8 @@ def octoutput(x, et):
f.text = d2hex(x.real)
f = ET.SubElement(a, "f")
f.text = d2hex(x.imag)
elif isinstance(x, sp.compatibility.string_types):
elif isinstance(x, str) or \
(sys.version_info[0] <= 2 and isinstance(x, unicode)):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of 1.6, SymPy no longer itself supports Python 2, so there should be no need to use Python 2 compatibility idioms in this codebase, unless you are still supporting SymPy 1.5 and Python 2.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks. I kind of am, b/c my windows package relies on something (py2exe) that doesn't work on Py3.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The py2exe on PyPI apparently supports Python 3 https://pypi.org/project/py2exe/

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last I checked I was held up by manthey/pyexe#25

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I suggest switching to pyinstaller? It can also produce a single exe binary which packs all the needed dlls. It is also actively developed unlike pyexe.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cbm755: The Windows installer for Octave 6.x (built with MXE Octave) bundles a minimal version of python 3.8, sympy 1.4 and the symbolic package 2.9.0. So, it should no longer be necessary to provide a separate Windows installer for the symbolic package. (At least for newer versions of Octave.)
It would probably be possible to change to different versions of python or sympy in MXE Octave if that simplifies an update of the symbolic package.
If this is holding back getting the symbolic package to work with newer versions of sympy, you could probably just ignore backward compatibility with python2 (for Windows).

a = ET.SubElement(et, "item")
f = ET.SubElement(a, "f")
f.text = str(OCTCODE_STR)
Expand Down