<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/37be48da8b5e1ae57a09ffc3b489d7c2883cc136">https://github.com/macports/macports-ports/commit/37be48da8b5e1ae57a09ffc3b489d7c2883cc136</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 37be48da8b5 py-setuptools: update to 54.1.2, bug fix
</span>37be48da8b5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37be48da8b5e1ae57a09ffc3b489d7c2883cc136
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 19 20:06:46 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-setuptools: update to 54.1.2, bug fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Relax MACOSX_DEPLOYMENT_TARGET check to allow different minor versions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62473
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62450
</span>---
python/py-setuptools/Portfile | 10 ++++---
.../py-setuptools/files/_distutils_spawn.py.patch | 34 ++++++++++++++++++++++
2 files changed, 40 insertions(+), 4 deletions(-)
<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 79ed0baff1f..06c9c49a6e3 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 54.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 54.1.2
</span> categories-append devel
# License status is murky. The current maintainer decided to relicense as
# MIT, but he doesn't appear to have obtained the permission of previous
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ supported_archs noarch
</span>
homepage https://pypi.org/project/setuptools/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 8e6f57965865fe7afd9d4ee68016b0aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8d169505b5dc2c103b52f6724004dc1fbf337ea8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1ce82798848a978696465866bb3aaab356003c42d6143e1111fcf069ac838274
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 684e00a094af81fac87ffe0bcf5732c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c8a3993a3c8efde88e96e6aacd8367832573b664 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ebd0148faf627b569c8d2a1b20f5d3b09c873f12739d71c7ee88f037d5be82ff
</span>
python.versions 26 27 33 34 35 36 37 38 39
python.link_binaries no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,8 @@ if {$subport ne $name} {
</span> post-destroot {
ln -s ${python.prefix}/bin/easy_install-${python.branch} ${destroot}${prefix}/bin
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append _distutils_spawn.py.patch
</span> }
if {${python.version} == 35} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-setuptools/files/_distutils_spawn.py.patch b/python/py-setuptools/files/_distutils_spawn.py.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4270f913573
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-setuptools/files/_distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setuptools/_distutils/spawn.py.orig 2021-03-19 19:19:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setuptools/_distutils/spawn.py 2021-03-19 19:54:58.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,11 +64,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # than that used when the interpreter was built. This ensures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # extension modules are built with correct compatibility values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raise DistutilsPlatformError(my_msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cur_target_split = [int(x) for x in cur_target.split('.')]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if _cfg_target_split > cur_target_split:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Before macOS 11 Big Sur, major OS version was 10.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Now it's 11, 12, etc. But Big Sur can sometimes identify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # itself as 10.16 for compatibility.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_majors = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for vers in [_cfg_target_split, cur_target_split]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if vers[0] >= 11:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_majors.append(vers[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif (vers[0], vers[1]) == (10, 16):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_majors.append(11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_majors.append((vers[0], vers[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if target_majors[0] != target_majors[1]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # not just a difference in minor version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raise DistutilsPlatformError(my_msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.update(MACOSX_DEPLOYMENT_TARGET=cur_target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span></pre><pre style='margin:0'>
</pre>