<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/792d78fbe08bd147505f5eff2460c77f968c93bd">https://github.com/macports/macports-ports/commit/792d78fbe08bd147505f5eff2460c77f968c93bd</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 792d78f py-tensor*: ignore existing installs so conflicting on self isn't needed.
</span>792d78f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 792d78fbe08bd147505f5eff2460c77f968c93bd
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Sun Sep 1 17:22:19 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-tensor*: ignore existing installs so conflicting on self isn't needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Pass --ignore-installed to pip so it will reinstall the package and
</span><span style='display:block; white-space:pre;color:#404040;'> ignore any existing installed package.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This makes it easier to upgrade the packages than having to deactivate
</span><span style='display:block; white-space:pre;color:#404040;'> them.
</span>---
python/py-tensorboard/Portfile | 7 +------
python/py-tensorflow/Portfile | 7 +------
python/py-tensorflow_estimator/Portfile | 4 +---
3 files changed, 3 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorboard/Portfile b/python/py-tensorboard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d4013e..46f0c21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name py-tensorboard
version 1.14.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +42,6 @@ python.versions 27 35 36 37
</span> python.default_version 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build ${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-pip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +65,7 @@ if {${name} ne ${subport}} {
</span>
destroot.cmd pip-${python.branch}
destroot.args \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-installed \
</span> --no-cache-dir \
--no-dependencies \
--root ${destroot} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +73,4 @@ if {${name} ne ${subport}} {
</span> destroot.post_args
livecheck.type none
<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;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d90adc..a3caf2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,6 @@ PortGroup github 1.0
</span> PortGroup compilers 1.0
PortGroup xcodeversion 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name py-tensorflow
version 1.14.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +63,6 @@ python.default_version 37
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tensorflow cannot be built/desrooted whilst it is still installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build ${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-pip \
port:py${python.version}-mock \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,8 +192,7 @@ if {${name} ne ${subport}} {
</span>
destroot.cmd pip-${python.branch}
destroot.args \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --upgrade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --force-reinstall \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-installed \
</span> --no-cache-dir \
--no-dependencies \
--root ${destroot} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow_estimator/Portfile b/python/py-tensorflow_estimator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 398124f..a017dc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow_estimator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow_estimator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
name py-tensorflow_estimator
version 1.14.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +37,6 @@ python.versions 27 35 36 37
</span> python.default_version 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build ${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-pip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +50,7 @@ if {${name} ne ${subport}} {
</span>
destroot.cmd pip-${python.branch}
destroot.args \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-installed \
</span> --no-cache-dir \
--no-dependencies \
--root ${destroot} \
</pre><pre style='margin:0'>
</pre>