<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/9b8f89becf3b74a64bd5f2dc77e6ecb874f35d09">https://github.com/macports/macports-ports/commit/9b8f89becf3b74a64bd5f2dc77e6ecb874f35d09</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 9b8f89b py-gpilab: update to latest; add 38 flavors. (#6333)
</span>9b8f89b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9b8f89becf3b74a64bd5f2dc77e6ecb874f35d09
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Mon Feb 10 16:46:06 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-gpilab: update to latest; add 38 flavors. (#6333)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * py-gpilab: update to latest; add 38 flavors.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix order of depends_lib and trailing slash...
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove stray whitespace.
</span>---
python/py-gpilab-core/Portfile | 13 ++++++------
.../py-gpilab-core/files/Matplotlib_GPI.py.patch | 20 ------------------
python/py-gpilab-examples/Portfile | 2 +-
python/py-gpilab-framework/Portfile | 14 +++++++------
.../py-gpilab-framework/files/canvasGraph.py.diff | 24 ----------------------
.../py-gpilab-framework/files/mainWindow.py.diff | 4 +++-
6 files changed, 18 insertions(+), 59 deletions(-)
<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 6fc66f2..59d7841 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,10 +4,10 @@ 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 2.0.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpilab core-nodes 2.0.3 v
</span> name py-gpilab-core
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38
</span> python.default_version 37
platforms darwin
license {BSD LGPL-3+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ 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 b59e428fdcc5a2cd4fa29928249524d97d25aec7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 681da0b41123c85e3e09b0e705b44d85e42cda6e66ad03c914cf10a20b35fa97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 180557
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6966ef73ab5c58713e6fdc73de3716c2e3ae3454 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4c6ec41c0160a4959259c7df529f65fb73900b6843bfac995891ade49a3078b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 174640
</span>
if {${name} ne ${subport} } {
depends_lib-append port:py${python.version}-gpilab-framework \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,7 @@ if {${name} ne ${subport} } {
</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:#ffe0e0;'>- Matplotlib_GPI.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles math_fft_PyMOD_cpp.patch
</span>
use_configure no
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 488ad48..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gpilab-core/files/Matplotlib_GPI.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./display/GPI/Matplotlib_GPI.py 2019-07-30 09:55:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./display/GPI/Matplotlib_GPI.py 2019-08-09 10:09:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if tooltip_text is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a.setToolTip(tooltip_text)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.buttons = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self.buttons = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add the x,y location widget at the right side of the toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The stretch factor is 1 which means any resizing of the toolbar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- labelAction.setVisible(True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reference holder for subplots_adjust window
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.adj_window = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #self.adj_window = None
</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;'>- # -*- 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 f9d8c71..ffe11c5 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;'>@@ -8,7 +8,7 @@ github.setup gpilab examples d9a6861
</span> version 0
name py-gpilab-examples
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38
</span> python.default_version 37
supported_archs noarch
platforms darwin
<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 875c2e5..eba8e96 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,10 +5,10 @@ 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.1.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpilab framework 1.2.3 v
</span> name py-gpilab-framework
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36 37 38
</span> python.default_version 37
supported_archs noarch
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ homepage http://gpilab.com
</span> supported_archs noarch
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 aca98e6df9c0b0222091ff69be95f34d55438739 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eb64aab60c46d0b9e02fb704b591fe35c4e0f37151981664e3ce7bd74e0e9eb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3991138
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a1bc9f6b3a86fead3dd8c8f0cb325d2041b8120d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf7e56cd9d229ed790b7fe7bcf5e2fd61ed28e9fdd03abfa9579413cb55efb03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3991711
</span>
patchfiles mainWindow.py.diff \
canvasGraph.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@ patchfiles mainWindow.py.diff \
</span> if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-numpy \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5 \
</span> port:py${python.version}-qtpy
depends_run-append port:astyle \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +52,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pep8 \
port:py${python.version}-Pillow \
port:py${python.version}-pyflakes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#e0e0e0;'>@@ -74,6 +74,8 @@ if {${name} ne ${subport}} {
</span> reinplace "s/10\\.9/${macosx_deployment_target}/" lib/gpi/make.py
reinplace "s^GPI_DOCS_DIR\+'^'${prefix}/share/${subport}^" \
lib/gpi/mainWindow.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s^, exclusive=False^^" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/gpi/mainWindow.py
</span> reinplace "s^%%PYFIPATH%%^${prefix}/share/${subport}/include^" \
lib/gpi/make.py
}
<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 3b60623..9f469fb 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;'>@@ -1,29 +1,5 @@
</span> --- lib/gpi/canvasGraph.py.orig 2018-04-05 22:57:22.000000000 -0500
+++ lib/gpi/canvasGraph.py 2018-10-10 11:00:42.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,6 +72,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import random
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+op_sys = platform.system()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if op_sys == 'Darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from Foundation import NSURL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gpi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import gpi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -805,7 +809,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mimeData = event.mimeData()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log.debug(str(mimeData))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- paths = [str(x.path()) for x in mimeData.urls()]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if op_sys == 'Darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ paths = [NSURL.URLWithString_(x.toString()).filePathURL().path()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for x in mimeData.urls()]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ paths = [str(x.path()) for x in mimeData.urls()]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log.debug(paths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if multiple drops, then add random offsets to pos
</span> @@ -1626,6 +1626,9 @@
else:
macroAct.setChecked(False)
<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 caec7d0..d2817af 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,11 +1,13 @@
</span> --- lib/gpi/mainWindow.py.orig 2019-07-10 16:48:20.000000000 -0500
+++ lib/gpi/mainWindow.py 2019-07-10 16:48:45.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,8 +40,8 @@
</span> from .logger import manager
from .widgets import DisplayBox, TextBox, TextEdit
from .sysspecs import Specs
-from .update import UpdateWindow
+#from .update import UpdateWindow
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-from .sysspecs import Specs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#from .sysspecs import Specs
</span>
# start logger for this module
log = manager.getLogger(__name__)
</pre><pre style='margin:0'>
</pre>