<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e86f421f048d0c8d453cac2e9c5e151f4bb90e9">https://github.com/macports/macports-ports/commit/9e86f421f048d0c8d453cac2e9c5e151f4bb90e9</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 9e86f42 gpilab: Update to latest versions.
</span>9e86f42 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e86f421f048d0c8d453cac2e9c5e151f4bb90e9
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Wed Oct 16 16:19:31 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> gpilab: Update to latest versions.
</span>---
python/gpilab_select/Portfile | 2 +-
python/gpilab_select/files/base | 1 +
python/gpilab_select/files/none | 1 +
python/py-gpilab-core/Portfile | 28 +++++++++--------
.../py-gpilab-core/files/Matplotlib_GPI.py.patch | 20 ++++++++++++
python/py-gpilab-examples/Portfile | 6 ++--
python/py-gpilab-framework/Portfile | 36 +++++++++++++---------
.../py-gpilab-framework/files/canvasGraph.py.diff | 10 ++++++
python/py-gpilab-framework/files/gpilab-35 | 1 +
python/py-gpilab-framework/files/gpilab-36 | 1 +
python/py-gpilab-framework/files/gpilab-37 | 1 +
.../py-gpilab-framework/files/mainWindow.py.diff | 36 +++++++---------------
12 files changed, 86 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/gpilab_select/Portfile b/python/gpilab_select/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e9debe..b9e9423 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/gpilab_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/gpilab_select/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup select 1.0
name gpilab_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.1
</span> categories python
license BSD
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/gpilab_select/files/base b/python/gpilab_select/files/base
</span><span style='display:block; white-space:pre;color:#808080;'>index e690a57..18a4e8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/gpilab_select/files/base
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/gpilab_select/files/base
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/gpi
</span> bin/gpi_launch
bin/gpi_make
include/PyFI
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/gpilab_select/files/none b/python/gpilab_select/files/none
</span><span style='display:block; white-space:pre;color:#808080;'>index 41fe9f5..b510382 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/gpilab_select/files/none
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/gpilab_select/files/none
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,3 +2,4 @@
</span> -
-
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-core/Portfile b/python/py-gpilab-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e7def95..dee8eb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gpilab core-nodes 1.0.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpilab core-nodes 2.0.2 v
</span> name py-gpilab-core
revision 0
python.versions 35 36 37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +21,18 @@ long_description The core nodes are a collection of basic data \
</span> homepage http://gpilab.com
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 840f103578a72ee37aabd3d7b1c95046d1ee56b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6c7491cd5e6529eec7ea50ca0b927cfb6b6b62ccb1d1ea5e677ceda0391ec868 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 174376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b59e428fdcc5a2cd4fa29928249524d97d25aec7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 681da0b41123c85e3e09b0e705b44d85e42cda6e66ad03c914cf10a20b35fa97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 180557
</span>
if {${name} ne ${subport} } {
depends_lib-append port:py${python.version}-gpilab-framework \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtpy \
</span> port:py${python.version}-h5py \
port:py${python.version}-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles math_fft_PyMOD_cpp.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles math_fft_PyMOD_cpp.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Matplotlib_GPI.py.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +41,9 @@ if {${name} ne ${subport} } {
</span> foreach mod ${MODS} {
set D [file dirname ${mod}]
set M [string range [file tail ${mod}] 0 end-10]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${worksrcpath} ${D}/core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${worksrcpath} ${D}/gpi_core
</span> system -W ${D} "${prefix}/bin/gpi_make-${python.version} ${M}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${D}/core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${D}/gpi_core
</span> }
system -W ${worksrcpath} \
"${prefix}/bin/python${python.branch} -O -m compileall ."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,19 +52,19 @@ if {${name} ne ${subport} } {
</span> destroot {
xinstall -d ${destroot}${prefix}/share/${subport}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set PP ${destroot}${python.pkgd}/gpi/node-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PP ${destroot}${python.pkgd}
</span> xinstall -d ${PP}
# Normalize hack required due to symlink generation in github portgroup
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy [file dirname [file normalize ${worksrcpath}/_]] ${PP}/core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy [file dirname [file normalize ${worksrcpath}/_]] ${PP}/gpi_core
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${PP}/core \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${PP}/gpi_core \
</span> "mv {AUT,LIC,COP,READ}* ${destroot}${prefix}/share/${subport}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${PP}/core/.gitattributes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PP}/core/.gitignore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${PP}/gpi_core/.gitattributes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PP}/gpi_core/.gitignore
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse pth ${PP}/core {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse pth ${PP}/gpi_core {
</span> if {[file isfile ${pth}]} {
if {[string match *build/temp* ${pth}] ||
[string match *.c ${pth}] ||
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-core/files/Matplotlib_GPI.py.patch b/python/py-gpilab-core/files/Matplotlib_GPI.py.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..488ad48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-core/files/Matplotlib_GPI.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./display/GPI/Matplotlib_GPI.py 2019-07-30 09:55:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./display/GPI/Matplotlib_GPI.py 2019-08-09 10:09:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if tooltip_text is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a.setToolTip(tooltip_text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.buttons = {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #self.buttons = {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add the x,y location widget at the right side of the toolbar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The stretch factor is 1 which means any resizing of the toolbar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelAction.setVisible(True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # reference holder for subplots_adjust window
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.adj_window = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #self.adj_window = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-examples/Portfile b/python/py-gpilab-examples/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e4e597d..2049a09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-examples/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-examples/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> github.setup gpilab examples d9a6861
version 0
name py-gpilab-examples
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> python.versions 35 36 37
python.default_version 37
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,8 @@ if {${name} ne ${subport}} {
</span> build { }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set DD ${destroot}${prefix}/share/py${python.version}-gpilab-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set FP ${prefix}/share/py${python.version}-gpilab-framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set DD ${destroot}${prefix}/share/py${python.version}-gpilab-examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set FP ${prefix}/share/py${python.version}-gpilab-examples
</span> xinstall -d ${DD}/Examples
xinstall -d ${destroot}${prefix}/share/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/Portfile b/python/py-gpilab-framework/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc1792e..e70e3e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gpilab framework 1.0.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpilab framework 1.1.5 v
</span> name py-gpilab-framework
revision 0
python.versions 35 36 37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,37 +26,39 @@ long_description This is the GPI Framework project. The framework \
</span>
homepage http://gpilab.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8f3e8bdd8acee229f67d40673d7ef38df74a899d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ca3751812187a939e71854df13cddf78147085ee16e5e4e6f8361cea6b6f391 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4114540
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 aca98e6df9c0b0222091ff69be95f34d55438739 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eb64aab60c46d0b9e02fb704b591fe35c4e0f37151981664e3ce7bd74e0e9eb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3991138
</span>
patchfiles mainWindow.py.diff \
canvasGraph.py.diff \
make.py.diff
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:py${python.version}-json-tricks \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-qtpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:astyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/eigen3/Eigen/Core:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-json-tricks \
</span> port:py${python.version}-opengl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyobjc \
</span> port:py${python.version}-pep8 \
port:py${python.version}-pillow \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-psutil \
</span> port:py${python.version}-pyflakes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyobjc \
</span> port:py${python.version}-qimage2ndarray \
port:py${python.version}-scipy \
port:py${python.version}-sip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:astyle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/eigen3/Eigen/Core:eigen3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3-single \
</span> port:gpilab_select
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace \
-E "s^/usr/bin/env python3?^${prefix}/bin/python${python.branch}^" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,12 +91,16 @@ if {${name} ne ${subport}} {
</span> xinstall -W ${worksrcpath}/bin ${bin} \
${DD}/bin/${bin}-${python.version}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${DD}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ln -s gpi_launch-${python.version} gpi-${python.version}"
</span> xinstall -d ${DD}/share/${subport}
xinstall -W ${worksrcpath} COPYING COPYING.LESSER LICENSE README.md \
${DD}/share/${subport}
xinstall -d ${PP}
file copy ${worksrcpath}/lib/gpi ${PP}/
file copy ${worksrcpath}/include ${DD}/share/${subport}/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W "${DD}/share/${subport}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ln -s ../py${python.version}-gpilab-examples/Examples Examples"
</span> }
select.group gpilab
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +108,7 @@ if {${name} ne ${subport}} {
</span>
notes "
To make the Python ${python.branch} version of gpilab the one that is run \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- when you execute the commands without a version suffix, e.g. 'gpi_launch', \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ when you execute the commands without a version suffix, e.g. 'gpi', \
</span> run:
sudo port select --set ${select.group} [file tail ${select.file}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/files/canvasGraph.py.diff b/python/py-gpilab-framework/files/canvasGraph.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e710f8f..3b60623 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/files/canvasGraph.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/files/canvasGraph.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,3 +24,13 @@
</span> log.debug(paths)
# if multiple drops, then add random offsets to pos
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1626,6 +1626,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macroAct.setChecked(False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for action in (copyAct, pasteAct, saveAct, loadAct, pauseAct):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ action.setShortcutVisibleInContextMenu(True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # basic editor actions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menu.addSeparator()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menu.addAction(copyAct)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/files/gpilab-35 b/python/py-gpilab-framework/files/gpilab-35
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a30d36..7da3e33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/files/gpilab-35
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/files/gpilab-35
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/gpi-35
</span> bin/gpi_launch-35
bin/gpi_make-35
share/py35-gpilab-framework/include/PyFI
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/files/gpilab-36 b/python/py-gpilab-framework/files/gpilab-36
</span><span style='display:block; white-space:pre;color:#808080;'>index d470a27..14d9be3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/files/gpilab-36
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/files/gpilab-36
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/gpi-36
</span> bin/gpi_launch-36
bin/gpi_make-36
share/py36-gpilab-framework/include/PyFI
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/files/gpilab-37 b/python/py-gpilab-framework/files/gpilab-37
</span><span style='display:block; white-space:pre;color:#808080;'>index 82b31eb..6fddc37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/files/gpilab-37
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/files/gpilab-37
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/gpi-37
</span> bin/gpi_launch-37
bin/gpi_make-37
share/py37-gpilab-framework/include/PyFI
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gpilab-framework/files/mainWindow.py.diff b/python/py-gpilab-framework/files/mainWindow.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4473206..caec7d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-framework/files/mainWindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gpilab-framework/files/mainWindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/gpi/mainWindow.py.orig 2018-05-23 16:29:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/gpi/mainWindow.py 2018-05-23 16:29:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/gpi/mainWindow.py.orig 2019-07-10 16:48:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/gpi/mainWindow.py 2019-07-10 16:48:45.000000000 -0500
</span> @@ -40,7 +40,7 @@
from .logger import manager
from .widgets import DisplayBox, TextBox, TextEdit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,30 +9,16 @@
</span>
# start logger for this module
log = manager.getLogger(__name__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -457,9 +457,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.helpMenu = QtGui.QMenu("&Help", self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -466,9 +466,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.helpMenu = QtWidgets.QMenu("&Help", self)
</span> aboutAction = self.helpMenu.addAction("&About")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- self.connect(aboutAction, QtCore.SIGNAL("triggered()"), self.about)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.checkForUpdate = QtGui.QAction("Check For Updates...", self, triggered=self.openUpdater)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.checkForUpdate.setMenuRole(QtGui.QAction.ApplicationSpecificRole)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aboutAction.triggered.connect(self.about)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.checkForUpdate = QtWidgets.QAction("Check For Updates...", self, triggered=self.openUpdater)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.checkForUpdate.setMenuRole(QtWidgets.QAction.ApplicationSpecificRole)
</span> - self.helpMenu.addAction(self.checkForUpdate)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self.checkForUpdate = QtGui.QAction("Check For Updates...", self, triggered=self.openUpdater)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self.checkForUpdate.setMenuRole(QtGui.QAction.ApplicationSpecificRole)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #self.checkForUpdate = QtWidgets.QAction("Check For Updates...", self, triggered=self.openUpdater)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #self.checkForUpdate.setMenuRole(QtWidgets.QAction.ApplicationSpecificRole)
</span> + #self.helpMenu.addAction(self.checkForUpdate)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- self.helpMenu_openDocs = QtGui.QAction("Documentation", self, triggered=self.openWebsite)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.helpMenu_openDocs = QtWidgets.QAction("Documentation", self, triggered=self.openWebsite)
</span> self.helpMenu.addAction(self.helpMenu_openDocs)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- self.helpMenu_openDocs = QtGui.QAction("Examples", self, triggered=self.openExamplesFolder)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -467,9 +467,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.menuBar().addMenu(self.helpMenu)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def openUpdater(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self._updateWin = UpdateWindow(dry_run=False)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self._updateWin.show()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self._updateWin.raise_()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self._updateWin = UpdateWindow(dry_run=False)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self._updateWin.show()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self._updateWin.raise_()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: move this and others like it to a common help-object that can errorcheck.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def openWebsite(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.helpMenu_openDocs = QtWidgets.QAction("Examples", self, triggered=self.openExamplesFolder)
</span></pre><pre style='margin:0'>
</pre>