<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/e3f85df38b56a9b75ee7222412a35852be82f350">https://github.com/macports/macports-ports/commit/e3f85df38b56a9b75ee7222412a35852be82f350</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e3f85df38b56a9b75ee7222412a35852be82f350
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon May 3 12:45:52 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow{X}: Adapt to changes in bazel PG
</span>---
python/py-tensorflow-addons/Portfile | 14 +++++++-------
python/py-tensorflow-data-validation/Portfile | 2 ++
python/py-tensorflow-metadata/Portfile | 6 +-----
python/py-tensorflow-probability/Portfile | 4 ++--
python/py-tensorflow/Portfile | 11 ++++++-----
python/py-tensorflow1/Portfile | 7 ++++---
6 files changed, 22 insertions(+), 22 deletions(-)
<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 1b05463e5e8..cc993a04917 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;'>@@ -73,19 +73,19 @@ if {${name} ne ${subport}} {
</span> reinplace "s| python | ${python.bin} |g" build_deps/build_pip_pkg.sh
reinplace "s|macosx_10_13|macosx_10_10|g" build_deps/build_pip_pkg.sh
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
bazel.configure_cmd ${python.bin}
bazel.configure_args configure.py
bazel.configure_pre_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.build_target \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable_runfiles build_pip_pkg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.post_build_cmd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./bazel-bin/build_pip_pkg artifacts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.run_bazel_fetch no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.extra_build_opts --enable_runfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.build_target build_pip_pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.post_build_cmd ./bazel-bin/build_pip_pkg artifacts
</span>
destroot.cmd pip-${python.branch}
destroot.args \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-data-validation/Portfile b/python/py-tensorflow-data-validation/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97f86f20800..d556721af73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-data-validation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-data-validation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,8 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.asroot yes
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-metadata/Portfile b/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f51bbd7d95..8eba87b01ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,7 @@ if {${name} ne ${subport}} {
</span> xinstall -d ${workpath}/bin ${bazel_build_proto_path}
ln -s ${python.bin} ${workpath}/bin/python
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${workpath}/bin
</span>
# replace with patch files after this repo is a little more stable
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,12 +71,7 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:$env(PATH)"
</span> build.asroot yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:$env(PATH)"
</span> destroot.asroot yes
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-probability/Portfile b/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3962bb0d6b9..1bf37c4d66d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,8 @@ if {${name} ne ${subport}} {
</span> ln -s ${python.bin} ${workpath}/bin/python
ln -s ${python.bin} ${workpath}/bin/python3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${python.prefix}/bin
</span>
bazel.build_target \
:pip_pkg
<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 ccfa9c9515e..f4ba4e9f7e2 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;'>@@ -18,7 +18,7 @@ license Apache-2
</span> maintainers {emcrisostomo @emcrisostomo} {jonesc @cjones051073} openmaintainer
description TensorFlow helps the tensors flow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
homepage https://www.tensorflow.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,14 +102,15 @@ if {${name} ne ${subport}} {
</span>
use_configure yes
# Options passed to configure script via env vars
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel::add_to_envs PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel::add_to_envs PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${python.prefix}/bin
</span>
bazel.build_target "//tensorflow/tools/pip_package:build_pip_package"
bazel.post_build_cmd ./bazel-bin/tensorflow/tools/pip_package/build_pip_package [list $workpath]
bazel.extra_build_opts-append --config=opt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #bazel.limit_build_jobs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.limit_build_jobs no
</span>
destroot.cmd pip-${python.branch}
destroot.args \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +128,7 @@ if {${name} ne ${subport}} {
</span>
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If tensorflow_macos is avialable for this OS + python version advertise it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If tensorflow_macos is available for this OS + python version advertise it
</span> if { ${os.major} > 19 && ${python.branch} == 3.8 } {
notes "
A hardware accelerated MacOS optimised port of tensorflow from Apple
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51da394f224..338cde1ced4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ license Apache-2
</span> maintainers {emcrisostomo @emcrisostomo} {jonesc @cjones051073} openmaintainer
description TensorFlow helps the tensors flow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
homepage https://www.tensorflow.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,8 +95,9 @@ if {${name} ne ${subport}} {
</span>
use_configure yes
# Options passed to configure script via env vars
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel::add_to_envs PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel::add_to_envs PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${python.prefix}/bin
</span>
bazel.build_target "//tensorflow/tools/pip_package:build_pip_package"
bazel.post_build_cmd ./bazel-bin/tensorflow/tools/pip_package/build_pip_package [list $workpath]
</pre><pre style='margin:0'>
</pre>