<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e94c8a1f8531ced6e1d765849193e36a590425c9">https://github.com/macports/macports-ports/commit/e94c8a1f8531ced6e1d765849193e36a590425c9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e94c8a1f8531ced6e1d765849193e36a590425c9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 2 13:41:16 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> python pg: use 'build' for pep517 builds
</span>---
_resources/port1.0/group/python-1.0.tcl | 9 ++++-----
python/py-packaging/Portfile | 1 +
python/py-pep517/Portfile | 1 +
python/py-python-install/Portfile | 1 +
python/py-setuptools/Portfile | 1 +
python/py-tomli/Portfile | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 90d06e564a7..1dce5723328 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,9 +295,9 @@ proc python_add_dependencies {} {
</span> depends_lib-delete port:python${python.version}
depends_lib-append port:python${python.version}
if {[option python.pep517]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:py${python.version}-pep517 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-build \
</span> port:py${python.version}-python-install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-pep517 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-build \
</span> port:py${python.version}-python-install
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -318,15 +318,14 @@ proc python_get_defaults {var} {
</span> }
build_cmd {
if {${python.pep517}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${python.bin} -m pep517.build --no-deps --binary --out-dir ${workpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${python.bin} -m build --wheel --no-isolation --outdir ${workpath}"
</span> } else {
return "${python.bin} setup.py --no-user-cfg"
}
}
build_target {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global worksrcpath
</span> if {${python.pep517}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span> } else {
return build[python_get_defaults jobs_arg]
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-packaging/Portfile b/python/py-packaging/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f060078870e..d496241da65 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-packaging/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-packaging/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,7 @@ if {$subport ne $name} {
</span> depends_build-append port:py-bootstrap-modules
depends_lib-append port:python${python.version}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span> destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pep517/Portfile b/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9081b20b09e..1ed0686077f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,7 @@ if {$subport ne $name} {
</span> }
patchfiles no-deps-option.diff
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span> destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-install/Portfile b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd23df56ea4..8fce5435016 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,7 @@ if {$subport ne $name} {
</span> port:py${python.version}-importlib-metadata
}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span> destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-setuptools/Portfile b/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 536f557621b..3a51e489548 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,7 @@ if {$subport ne $name} {
</span> depends_build port:py-bootstrap-modules
depends_lib port:python${python.version}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span> destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
} else {
use_zip yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tomli/Portfile b/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f40d775851e..88966ed15c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,7 @@ if {${name} ne ${subport}} {
</span> depends_build port:py-bootstrap-modules
depends_lib port:python${python.version}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span> destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
livecheck.type none
</pre><pre style='margin:0'>
</pre>