<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ded4887344dfa4e090baba4c95155c7e1fd118c">https://github.com/macports/macports-ports/commit/0ded4887344dfa4e090baba4c95155c7e1fd118c</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 0ded488 py-graph-tool: update to version 2.28
</span>0ded488 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ded4887344dfa4e090baba4c95155c7e1fd118c
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Sun Jun 9 09:30:04 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-graph-tool: update to version 2.28
</span>---
python/py-graph-tool/Portfile | 15 ++++++------
python/py-graph-tool/files/patch-async.diff | 33 ---------------------------
python/py-graph-tool/files/patch-cgal413.diff | 22 ------------------
3 files changed, 7 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/Portfile b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51a1e44..cfade3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span>
set realname graph-tool
name py-${realname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 20171109
categories python science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description graph-tool is an efficient python module for manipulation \
</span> homepage http://graph-tool.skewed.de
master_sites http://downloads.skewed.de/graph-tool/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3da208242310af40b795974a6cf3d50af7edf631 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4740c69720dfbebf8fb3e77057b3e6a257ccf0432cdaf7345f873247390e4313 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14989318
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 43b70d0dbbafabb34919065b8d3d1cda0c419dd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2dbe0c926c058b1a6f696a05b9d9b65a3ceed57b8b6b0fe1474076bca9f8111 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15063066
</span> distname ${realname}-${version}
python.versions 27 35 36 37
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ if {${os.major} <= 12 && ${os.platform} eq "darwin"} {
</span> if {${name} ne ${subport}} {
compiler.blacklist *gcc* {clang <= 700.1.81} {macports-clang-3.[0-6]}
compiler.fallback-append macports-clang-4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++14 -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -std=c++17 -stdlib=libc++
</span>
variant openmp description "Enable OpenMP" {
# make sure libomp is installed at runtime, even if the compiler gets uninstalled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ if {${os.major} <= 12 && ${os.platform} eq "darwin"} {
</span> variant clang60 requires openmp conflicts clang70 description "Use clang-6.0 and enable OpenMP" {
configure.compiler macports-clang-6.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang70 requires openmp conflicts clang60 description "Use clang-6.0 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant clang70 requires openmp conflicts clang60 description "Use clang-7.0 and enable OpenMP" {
</span> configure.compiler macports-clang-7.0
}
default_variants +openmp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-scipy \
port:py${python.version}-gobject3 \
port:py${python.version}-cairo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cgal413.diff patch-async.diff
</span> use_configure yes
# parallel build starts swapping with 8GB of RAM.
#use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/files/patch-async.diff b/python/py-graph-tool/files/patch-async.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7c3be5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/files/patch-async.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/graph_tool/draw/gtk_draw.py b/src/graph_tool/draw/gtk_draw.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9f60075d..cd3edf97 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/graph_tool/draw/gtk_draw.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/graph_tool/draw/gtk_draw.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1182,7 +1182,7 @@ _window_list = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def interactive_window(g, pos=None, vprops=None, eprops=None, vorder=None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eorder=None, nodesfirst=False, geometry=(500, 400),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- update_layout=True, async=False, no_main=False, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ update_layout=True, sync=True, no_main=False, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Display an interactive GTK+ window containing the given graph.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1211,8 +1211,8 @@ def interactive_window(g, pos=None, vprops=None, eprops=None, vorder=None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Window geometry.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- update_layout : bool (optional, default: ``True``)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If ``True``, the layout will be updated dynamically.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- async : bool (optional, default: ``False``)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- If ``True``, run asynchronously. (Requires :mod:`IPython`)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sync : bool (optional, default: ``True``)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ If ``False``, run asynchronously. (Requires :mod:`IPython`)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no_main : bool (optional, default: ``False``)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If ``True``, the GTK+ main loop will not be called.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **kwargs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1244,7 +1244,7 @@ def interactive_window(g, pos=None, vprops=None, eprops=None, vorder=None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win.show_all()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _window_list.append(win)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not no_main:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if async:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not sync:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # just a placeholder for a proper main loop integration with gtk3 when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ipython implements it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import IPython.lib.inputhook
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/files/patch-cgal413.diff b/python/py-graph-tool/files/patch-cgal413.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 874597f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/files/patch-cgal413.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/graph/generation/graph_triangulation.cc b/src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f7a9a545..4d418beb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,18 @@ bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// comparison missing in 4.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (CGAL_VERSION_NR >= 1041301000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace CGAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool operator==(const DelaunayTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const DelaunayTriangulation::Vertex& b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return a.point() == b.point();
</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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graph_triangulation.hh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "numpy_bind.hh"
</span></pre><pre style='margin:0'>
</pre>