<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/dfa5ee2fc7b604700f104c09aa6e13fc44452343">https://github.com/macports/macports-ports/commit/dfa5ee2fc7b604700f104c09aa6e13fc44452343</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dfa5ee2fc7b604700f104c09aa6e13fc44452343
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 18 18:41:11 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-build deps: revise py-bootstrap-modules use
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer needed for newer python versions.
</span>---
python/py-parsing/Portfile | 4 +++-
python/py-tomli/Portfile | 18 ++++++++++++------
python/py-wheel/Portfile | 10 +++++-----
3 files changed, 20 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-parsing/Portfile b/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5251fcbe642..88e08d6bd81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,9 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-setuptools
} else {
python.pep517 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # break circular dependency with py-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # break circular dependency with py36-build
</span> python.add_dependencies no
depends_build-append port:py-bootstrap-modules
depends_lib-append port:python${python.version}
<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 69a21029f64..d9399f36ae1 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;'>@@ -31,12 +31,18 @@ if {${name} ne ${subport}} {
</span> }
python.pep517 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.add_dependencies no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:python${python.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args --skip-dependency-check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517_backend flit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} < 311} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Break circular dependencies with py-build and friends when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # there is no tomllib in the stdlib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.add_dependencies no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:python${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args --skip-dependency-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
livecheck.type none
}
<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 a658f658f60..bca111f25fb 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;'>@@ -48,11 +48,7 @@ if {${name} ne ${subport}} {
</span>
if {${python.version} == 36} {
depends_build-append port:py${python.version}-importlib-resources
<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;background:#ffe0e0;'>- if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.pep517 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # break circular dependency with py-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # break circular dependency with py36-build
</span> python.add_dependencies no
depends_build-append port:py-bootstrap-modules
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,4 +58,8 @@ if {${name} ne ${subport}} {
</span> build.args --skip-dependency-check
destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>