<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c7e07b49a1a2ffcf80213d1fdaf6cd605099cf7">https://github.com/macports/macports-ports/commit/7c7e07b49a1a2ffcf80213d1fdaf6cd605099cf7</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 7c7e07b py-colormath: patch to fix networkx 2.0 compatibility
</span>7c7e07b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c7e07b49a1a2ffcf80213d1fdaf6cd605099cf7
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Tue Oct 10 12:04:25 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-colormath: patch to fix networkx 2.0 compatibility
</span>---
python/py-colormath/Portfile | 6 ++++++
python/py-colormath/files/networkx2.diff | 14 ++++++++++++++
2 files changed, 20 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-colormath/Portfile b/python/py-colormath/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75ec712..ef855f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-colormath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-colormath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
github.setup gtaylor python-colormath 2.1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name py-colormath
categories-append math
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +32,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-nose \
port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/conda-forge/colormath-feedstock/blob/master/recipe/networkx2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for networkx 2.0 compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles networkx2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport}
xinstall -m 644 -W ${worksrcpath} README.rst LICENSE.txt \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-colormath/files/networkx2.diff b/python/py-colormath/files/networkx2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5e3b6bd
</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-colormath/files/networkx2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- colormath/color_conversions.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ colormath/color_conversions.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,10 @@ def get_conversion_path(self, start_type, target_type):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def add_type_conversion(self, start_type, target_type, conversion_function):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ super(GraphConversionManager, self).add_type_conversion(start_type, target_type, conversion_function)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.conversion_graph.add_edge(start_type, target_type, {'conversion_function': conversion_function})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if networkx.__version__.startswith('2'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.conversion_graph.add_edge(start_type, target_type, conversion_function=conversion_function)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.conversion_graph.add_edge(start_type, target_type, {'conversion_function': conversion_function})
</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;'>+ class DummyConversionManager(ConversionManager):
</span></pre><pre style='margin:0'>
</pre>