<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/830603e2b286d6cd3858731c3fd2fdc9ef0d9c13">https://github.com/macports/macports-ports/commit/830603e2b286d6cd3858731c3fd2fdc9ef0d9c13</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 830603e2b28 octave-symbolic: update to 3.0.0
</span>830603e2b28 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 830603e2b286d6cd3858731c3fd2fdc9ef0d9c13
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Fri Aug 12 06:02:49 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-symbolic: update to 3.0.0
</span>---
math/octave-symbolic/Portfile | 15 ++---
math/octave-symbolic/files/1051.diff | 73 ----------------------
.../files/patch-inst-private-defaultpython.m.diff | 11 ++--
3 files changed, 11 insertions(+), 88 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/Portfile b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index caee6748308..215ad1f2477 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup symbolic 2.9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup symbolic 3.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
license GPL-3
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,9 +12,9 @@ description Symbolic toolbox based on SymPy.
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c2f03a1e09bc0e8f05d98b0f522b8d20e422be73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 089ec44a0a49417a8b78797e87f338da6a6e227509f3080724996483d39b23cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 259373
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fc112c0b7b3c0c04536cc024e9beeebd47ca2b79 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d0181ec356a87091c7fa88ab52a3430ea69e97f9eab90e28c937f2ee5fcb27a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 261091
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,6 @@ foreach pv {310 39 38 37} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable sympy > 1.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://octave.discourse.group/t/symbolic-package-in-macos/1178
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and https://github.com/cbm755/octsympy/pull/1051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 1051.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/55361
patchfiles-append patch-inst-private-defaultpython.m.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/files/1051.diff b/math/octave-symbolic/files/1051.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 885bc52709c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/files/1051.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/inst/private/check_and_convert.m b/inst/private/check_and_convert.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 928cde14..9d951a8e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/private/check_and_convert.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/private/check_and_convert.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,8 +30,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp = py.sympy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _sym = py.tuple({sp.Basic, sp.MatrixBase});
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- string_types = sp.compatibility.string_types;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- integer_types = sp.compatibility.integer_types;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string_types = py.str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ integer_types = py.int;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/inst/private/python_header.py b/inst/private/python_header.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2027f978..f2be7600 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/private/python_header.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/private/python_header.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,6 +9,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import division
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from sympy.core.compatibility import unicode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.ps1 = ""; sys.ps2 = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +53,8 @@ def echo_exception_stdout(mystr):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import collections
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from re import split
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch pretty printer, issue #952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _mypp = pretty.__globals__["PrettyPrinter"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from sympy.printing.pretty.pretty import PrettyPrinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _mypp = PrettyPrinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _my_rev_print(cls, f, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g = f.func(*reversed(f.args), evaluate=False)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return cls._print_Function(g, **kwargs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +188,8 @@ def octoutput(x, et):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c = ET.SubElement(et, "list")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for y in x:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octoutput(y, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif isinstance(x, sp.compatibility.integer_types):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif isinstance(x, int) or \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys.version_info[0] <= 2 and isinstance(x, long)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a = ET.SubElement(et, "item")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = ET.SubElement(a, "f")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.text = str(OCTCODE_INT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +210,8 @@ def octoutput(x, et):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.text = d2hex(x.real)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = ET.SubElement(a, "f")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.text = d2hex(x.imag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif isinstance(x, sp.compatibility.string_types):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif isinstance(x, str) or \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys.version_info[0] <= 2 and isinstance(x, unicode)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a = ET.SubElement(et, "item")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f = ET.SubElement(a, "f")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.text = str(OCTCODE_STR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/inst/private/python_ipc_native.m b/inst/private/python_ipc_native.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9da92f07..f1ba52cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/private/python_ipc_native.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/private/python_ipc_native.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +82,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'import collections'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'from re import split'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '# patch pretty printer, issue #952'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '_mypp = pretty.__globals__["PrettyPrinter"]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'from sympy.printing.pretty.pretty import PrettyPrinter'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '_mypp = PrettyPrinter'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'def _my_rev_print(cls, f, **kwargs):'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ' g = f.func(*reversed(f.args), evaluate=False)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ' return cls._print_Function(g, **kwargs)'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/files/patch-inst-private-defaultpython.m.diff b/math/octave-symbolic/files/patch-inst-private-defaultpython.m.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f8d2b591249..d1145a89104 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/files/patch-inst-private-defaultpython.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-symbolic/files/patch-inst-private-defaultpython.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/private/defaultpython.m.orig 2018-07-12 23:13:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/private/defaultpython.m 2018-07-27 16:50:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/private/defaultpython.m.orig 2022-07-05 03:33:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/private/defaultpython.m 2022-08-12 05:59:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span> function python = defaultpython ()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ % PEP394 says Python 3 installs should all provide this command
</span> - python = 'python3';
+ python = '__MACPORTS_PYTHON__';
<span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ispc () && (~isunix ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ % 2020-03: Python.org installer/Anaconda do not provide python3
</span></pre><pre style='margin:0'>
</pre>