<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/74b78db23f5bdfd1841179c0b9f2d48a9d9efca5">https://github.com/macports/macports-ports/commit/74b78db23f5bdfd1841179c0b9f2d48a9d9efca5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74b78db23f5bdfd1841179c0b9f2d48a9d9efca5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jul 28 21:21:25 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> python pg: use installer for pep517 destroot on py37+
</span>---
_resources/port1.0/group/python-1.0.tcl | 14 +++++++++++++-
python/py-build/Portfile | 10 ++++++++--
python/py-importlib-resources/Portfile | 2 ++
python/py-wheel/Portfile | 4 +---
4 files changed, 24 insertions(+), 6 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 c3227f3d825..ff051c81524 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;'>@@ -327,6 +327,13 @@ proc python_add_dependencies {} {
</span> port:py${python.version}-python-install
depends_build-append port:py${python.version}-build \
port:py${python.version}-python-install
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-python-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-python-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> switch -- [option python.pep517_backend] {
setuptools {
depends_build-delete port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +401,12 @@ proc python_get_defaults {var} {
</span> }
destroot_cmd {
if {${python.pep517}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${python.bin} -m install --verbose"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args "install --verbose"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${python.bin} -m ${args}"
</span> } else {
return "${python.bin} setup.py --no-user-cfg"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-build/Portfile b/python/py-build/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c181a49b88e..8620ccf137c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-build/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-build/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,13 +36,19 @@ if {${name} ne ${subport}} {
</span> python.add_dependencies no
depends_build-append \
port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-wheel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-python-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-wheel
</span> depends_lib-append port:py${python.version}-packaging \
port:py${python.version}-pep517 \
port:py${python.version}-tomli \
port:python${python.version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-installer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-python-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${python.version} < 38} {
depends_lib-append \
port:py${python.version}-importlib-metadata
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-importlib-resources/Portfile b/python/py-importlib-resources/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 596e7d5dc40..85d67abe9e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-importlib-resources/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-importlib-resources/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +78,8 @@ if {${name} ne ${subport}} {
</span> depends_build-append \
port:py${python.version}-setuptools_scm
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 36} {
</span> # break circular dependency with python-install
python.add_dependencies no
depends_build-append port:py-bootstrap-modules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wheel/Portfile b/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c79050bb9b6..eef2c0fc18e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ PortGroup python 1.0
</span> name py-wheel
version 0.37.1
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +41,7 @@ if {${name} ne ${subport}} {
</span> python.pep517 yes
# break circular dependency with py-build
python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-python-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py-bootstrap-modules
</span>
depends_lib-append port:python${python.version}
</pre><pre style='margin:0'>
</pre>