<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/130336b55ece9db53f4ef1f013344eca3b6eadbd">https://github.com/macports/macports-ports/commit/130336b55ece9db53f4ef1f013344eca3b6eadbd</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 130336b octave-symbolic: patch defaultpython.m, drop Python 3.7 support
</span>130336b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 130336b55ece9db53f4ef1f013344eca3b6eadbd
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jul 27 16:57:45 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-symbolic: patch defaultpython.m, drop Python 3.7 support
</span>---
math/octave-symbolic/Portfile | 40 +++++++++-------------
.../files/patch-inst-private-defaultpython.m.diff | 10 ++++++
2 files changed, 26 insertions(+), 24 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 d8b16cf..9213d22 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;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup symbolic 2.7.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,45 +21,29 @@ supported_archs noarch
</span> variant python27 description "Use Python 2.7 SymPy" conflicts python35 python36 python37 {
depends_lib-append port:python27 \
port:py27-sympy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setenv PYTHON ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python2.7
</span> }
variant python35 description "Use Python 3.5 SymPy" conflicts python27 python36 python37 {
depends_lib-append port:python35 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setenv PYTHON ${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.5
</span> }
variant python36 description "Use Python 3.6 SymPy" conflicts python27 python35 python37 {
depends_lib-append port:python36 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setenv PYTHON ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.6
</span> }
variant python37 description "Use Python 3.7 SymPy" conflicts python27 python35 python36 {
depends_lib-append port:python37 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py37-sympy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As of symbolic version 2.7.0 your have to manually set the path to the Python executable within octave or in .octaverc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setenv PYTHON ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.7
</span> }
if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python27
</span> }
# make sure -python27 was not specified alone
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,3 +55,10 @@ if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset py
</span>
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/55361
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-inst-private-defaultpython.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_PYTHON__|${configure.python}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/inst/private/defaultpython.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..59fa640
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/private/defaultpython.m.orig 2018-07-12 23:13:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/private/defaultpython.m 2018-07-27 16:50:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function python = defaultpython ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python = 'python';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python = '__MACPORTS_PYTHON__';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span></pre><pre style='margin:0'>
</pre>