<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/f95cf35597e6d098cbdbcb5ea0807a2451590874">https://github.com/macports/macports-ports/commit/f95cf35597e6d098cbdbcb5ea0807a2451590874</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 f95cf35597e python pg: add python.pep517_backend option
</span>f95cf35597e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f95cf35597e6d098cbdbcb5ea0807a2451590874
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Dec 29 14:25:41 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> python pg: add python.pep517_backend option
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This automatically adds appropriate build dependencies for common
</span><span style='display:block; white-space:pre;color:#404040;'> PEP 517 back-ends. The default is setuptools, matching the fallback
</span><span style='display:block; white-space:pre;color:#404040;'> behaviour recommended by the PEP and implemented in py-build. The
</span><span style='display:block; white-space:pre;color:#404040;'> option can be cleared or set to something unrecognised like "other" if
</span><span style='display:block; white-space:pre;color:#404040;'> you don't want back-end deps added. This is useful if you are using
</span><span style='display:block; white-space:pre;color:#404040;'> a back-end that the portgroup doesn't know about, or for ports that
</span><span style='display:block; white-space:pre;color:#404040;'> install a back-end that can build itself.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Thanks to reneeotten for the idea.
</span>---
_resources/port1.0/group/python-1.0.tcl | 21 ++++++++++++++++++++-
python/py-aiojobs/Portfile | 1 +
python/py-aiosqlite/Portfile | 2 +-
python/py-fastapi/Portfile | 1 +
python/py-flit/Portfile | 1 +
python/py-flit_core/Portfile | 1 +
python/py-pendulum/Portfile | 4 ++--
python/py-pygmsh/Portfile | 2 +-
python/py-structlog/Portfile | 4 +---
python/py-textual/Portfile | 4 ++--
python/py-tinycss2/Portfile | 4 +---
python/py-tomli-w/Portfile | 3 +--
python/py-typer/Portfile | 4 +---
13 files changed, 34 insertions(+), 18 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 1dce5723328..92b8afe3f68 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;'>@@ -266,7 +266,8 @@ proc python_set_default_version {option action args} {
</span>
options python.branch python.prefix python.bin python.lib python.libdir \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.include python.pkgd python.pep517 python.add_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.include python.pkgd python.pep517 python.pep517_backend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.add_dependencies
</span> # for pythonXY, python.branch is X.Y, for pythonXYZ, it's X.YZ
default python.branch {[string index ${python.version} 0].[string range ${python.version} 1 end]}
default python.prefix {${frameworks_dir}/Python.framework/Versions/${python.branch}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,6 +283,7 @@ default destroot.destdir {[python_get_defaults destroot_destdir]}
</span> default destroot.target {[python_get_defaults destroot_target]}
default python.pep517 no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default python.pep517_backend setuptools
</span>
default python.add_dependencies yes
proc python_add_dependencies {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,6 +301,23 @@ 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;'>+ switch -- [option python.pep517_backend] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setuptools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-flit_core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-flit_core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ poetry {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:py${python.version}-poetry-core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-poetry-core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-aiojobs/Portfile b/python/py-aiojobs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07950ae8755..650e7d45463 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-aiojobs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-aiojobs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +22,7 @@ checksums rmd160 67d82112841069e0ce02087b7906b0143cfefead \
</span> python.versions 37 38 39 310
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend flit
</span>
if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-flit
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-aiosqlite/Portfile b/python/py-aiosqlite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8375c3f1c83..df1b15617cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-aiosqlite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-aiosqlite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +30,10 @@ checksums rmd160 ed6aa54cf1f913f18aff5d3336003793b51103e8 \
</span> python.versions 37 38 39
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend flit
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flit_core \
</span> port:py${python.version}-typing_extensions \
port:py${python.version}-wheel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-fastapi/Portfile b/python/py-fastapi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cadb3084fab..fe73546c8a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-fastapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-fastapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,7 @@ checksums rmd160 25c8572c976bf8e1cd043a2275809017c6e82f3b \
</span> python.versions 37 38 39
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend flit
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-flit/Portfile b/python/py-flit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0ccb113ea6..49e32801fb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-flit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-flit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,7 @@ checksums rmd160 1707e3d7b875dca434a29968172c8116ea6e8f9c \
</span> python.versions 37 38 39 310
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend other
</span>
if {$subport ne $name} {
depends_run-append port:py${python.version}-flit_core \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-flit_core/Portfile b/python/py-flit_core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f706f089ac..edda608698b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-flit_core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-flit_core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,7 @@ checksums md5 cf656ea7dac7cfa0f714e24bbadfb013 \
</span> python.versions 36 37 38 39 310
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend other
</span>
if {$subport ne $name} {
depends_run-append port:py${python.version}-tomli
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pendulum/Portfile b/python/py-pendulum/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c962795510c..0d8c75ea361 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pendulum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pendulum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ checksums rmd160 7c0fa29f559616634b7bada7b088983cb3e7c5ce \
</span>
if {${name} ne ${subport}} {
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517_backend poetry
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-poetry-core \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-wheel
</span>
depends_lib-append port:py${python.version}-dateutil \
port:py${python.version}-pytzdata
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygmsh/Portfile b/python/py-pygmsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fcb46e7d6df..a1ee096fa44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +40,10 @@ if {${name} ne ${subport}} {
</span>
} else {
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517_backend poetry
</span>
depends_build-append \
port:poetry \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-poetry-core \
</span> port:py${python.version}-wheel
depends_lib-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-structlog/Portfile b/python/py-structlog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b2fdbd5e69..4c2e635a863 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-structlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-structlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,13 +48,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-simplejson
if {${python.version} > 27} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append \
port:py${python.version}-pytest-asyncio
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517_backend flit
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-textual/Portfile b/python/py-textual/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 770dcaace39..0c94848297e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-textual/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-textual/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,11 @@ checksums rmd160 e22bb60a4088eee2f9101c107392d1ff3914b3c9 \
</span>
python.versions 39 310
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend poetry
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:poetry \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-poetry-core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:poetry
</span>
depends_lib-append port:py${python.version}-rich \
port:py${python.version}-typing_extensions
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tinycss2/Portfile b/python/py-tinycss2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee919b98af3..c53c7f01102 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tinycss2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tinycss2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,9 @@ checksums rmd160 a97bc4996a1d830b098ca36e2cfa7d026f2da7c8 \
</span> python.versions 36 37 38 39 310
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend flit
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flit_core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
port:py${python.version}-webencodings
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tomli-w/Portfile b/python/py-tomli-w/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a66ff8e4b88..7d8b6e4f2c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tomli-w/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tomli-w/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,10 @@ checksums rmd160 43f91fd9bfb334b82aef0b34cb77092eed64f22f \
</span> size 6531
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517_backend flit
</span> python.rootname tomli_w
python.versions 37 38 39 310
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py${python.version}-flit_core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-typer/Portfile b/python/py-typer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fab163849cb..6aafad27f1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-typer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-typer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,6 @@ checksums rmd160 617149bb85566eb60b8412ff7cf3978bda21ec95 \
</span> size 202253
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flit_core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_run-append \
port:py${python.version}-click \
port:py${python.version}-colorama \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +39,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pytest-xdist
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.pep517_backend flit
</span>
test.run yes
test.cmd py.test-${python.branch}
</pre><pre style='margin:0'>
</pre>