<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/37771038db7efbee450f49bb68e02bbf416dc988">https://github.com/macports/macports-ports/commit/37771038db7efbee450f49bb68e02bbf416dc988</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 37771038db7 py-X: Use path style dependency for tensorflow, to allow either py-tensorflow or py-tensorflow_macos
</span>37771038db7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37771038db7efbee450f49bb68e02bbf416dc988
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Apr 10 14:23:15 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-X: Use path style dependency for tensorflow, to allow either py-tensorflow or py-tensorflow_macos
</span>---
devel/apache-arrow/Portfile | 3 ++-
python/py-dm-sonnet/Portfile | 3 ++-
python/py-magenta/Portfile | 3 ++-
python/py-tensor2tensor/Portfile | 3 ++-
python/py-tensorflow-gan/Portfile | 3 ++-
python/py-tensorflow-transform/Portfile | 3 ++-
python/py-tensorflow/Portfile | 3 +++
python/py-tfx-bsl/Portfile | 3 ++-
python/py-transformers/Portfile | 3 ++-
9 files changed, 19 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-arrow/Portfile b/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c42f25dae2..f5de2ee9faf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,12 +195,13 @@ if {[string match "py*" ${subport}]} {
</span> port:py${python.version}-setuptools_scm \
port:py${python.version}-wheel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_lib-append \
port:apache-arrow \
port:py${python.version}-brotli \
port:py${python.version}-pycares \
port:py${python.version}-numpy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow
</span>
depends_test-append \
port:py${python.version}-cffi \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-dm-sonnet/Portfile b/python/py-dm-sonnet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9c41bf74c3..2ee7dedae19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-dm-sonnet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-dm-sonnet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,9 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow
</span>
test.run yes
test.env-append PYTHONPATH=${worksrcpath}/build/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magenta/Portfile b/python/py-magenta/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cb21afa814..3a162bbd9ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magenta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-magenta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pylint \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
port:py${python.version}-absl \
port:py${python.version}-apache-beam \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +64,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-sk-video \
port:py${python.version}-sox \
port:py${python.version}-tensor2tensor \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tensorflow-datasets \
port:py${python.version}-tensorflow-probability \
port:py${python.version}-tf-slim \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensor2tensor/Portfile b/python/py-tensor2tensor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65683fe4dcb..6c8e4fd2551 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensor2tensor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensor2tensor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,7 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
port:py${python.version}-absl \
port:py${python.version}-bz2file \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +56,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-scipy \
port:py${python.version}-six \
port:py${python.version}-sympy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow-addons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tensorflow-datasets \
port:py${python.version}-tensorflow-gan \
port:py${python.version}-tensorflow-probability \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-gan/Portfile b/python/py-tensorflow-gan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f13760170d..b83696a64cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-gan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-gan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,9 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-pip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tensorflow-hub \
port:py${python.version}-tensorflow-probability
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-transform/Portfile b/python/py-tensorflow-transform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25790baa547..e289832b9fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-transform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-transform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,7 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
port:py${python.version}-absl \
port:py${python.version}-apache-beam \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pydot \
port:py${python.version}-six \
port:py${python.version}-tensorflow-metadata \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tfx-bsl
build.asroot yes
<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 bae7f6faaeb..68f693211ad 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;'>@@ -100,6 +100,9 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-wheel \
port:py${python.version}-wrapt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tensorflow-addons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
# Options passed to configure script via env vars
configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tfx-bsl/Portfile b/python/py-tfx-bsl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b17f175886..002a7d2b35f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tfx-bsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tfx-bsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,7 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
port:py${python.version}-absl \
port:py${python.version}-apache-beam \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +56,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-protobuf3 \
port:py${python.version}-pyarrow \
port:py${python.version}-six \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tensorflow-metadata
depends_test-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-transformers/Portfile b/python/py-transformers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6490b41e754..c87a78e6f7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-transformers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-transformers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,7 @@ if {${name} ne ${subport}} {
</span> depends_lib-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_py_path Library/Frameworks/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/tensorflow
</span> depends_run-append \
port:py${python.version}-absl \
port:py${python.version}-black \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +83,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-sphinx \
port:py${python.version}-starlette \
port:py${python.version}-tensorboardX \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${tf_py_path}:py${python.version}-tensorflow \
</span> port:py${python.version}-tensorflow-datasets \
port:py${python.version}-timeout-decorator \
port:py${python.version}-tokenizers \
</pre><pre style='margin:0'>
</pre>