<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce009ed3b9e0ac9a77776fd72074192aa8563a11">https://github.com/macports/macports-ports/commit/ce009ed3b9e0ac9a77776fd72074192aa8563a11</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ce009ed3b9e0ac9a77776fd72074192aa8563a11
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Apr 8 15:40:09 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow-addons: Add conflict with py38-tensorflow_macos
</span>---
python/py-tensorflow-addons/Portfile | 5 +++++
1 file changed, 5 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-addons/Portfile b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5036050a923..c16362127a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,11 @@ if {${name} ne ${subport}} {
</span>
bazel.version 3.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conflicts with tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:bash \
port:py${python.version}-brotli \
</pre><pre style='margin:0'>
</pre>