<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/1cae62bb49c65c5ef30bda4520e06ca647948541">https://github.com/macports/macports-ports/commit/1cae62bb49c65c5ef30bda4520e06ca647948541</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 1cae62bb49c py-setuptools: update to 54.2.0
</span>1cae62bb49c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1cae62bb49c65c5ef30bda4520e06ca647948541
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Mar 25 14:18:47 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-setuptools: update to 54.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also update changes to MACOSX_DEPLOYMENT_TARGET check to the version
</span><span style='display:block; white-space:pre;color:#404040;'> sent upstream.
</span>---
python/py-setuptools/Portfile | 8 ++--
.../py-setuptools/files/_distutils_spawn.py.patch | 54 ++++++++++------------
2 files changed, 28 insertions(+), 34 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 06c9c49a6e3..33a6730cf1c 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.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 54.2.0
</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 684e00a094af81fac87ffe0bcf5732c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c8a3993a3c8efde88e96e6aacd8367832573b664 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ebd0148faf627b569c8d2a1b20f5d3b09c873f12739d71c7ee88f037d5be82ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 09f693b5d5ca8bf4fdb1da82f8110a9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ae5bb69994c6a1772959c764f061621d6c9fa2f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aa9c24fb83a9116b8d425e53bec24c7bfdbffc313c2159f9ed036d4a6dd32d7d
</span>
python.versions 26 27 33 34 35 36 37 38 39
python.link_binaries no
<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><span style='display:block; white-space:pre;color:#808080;'>index 4270f913573..e366ee0772d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-setuptools/files/_distutils_spawn.py.patch
</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;'>@@ -1,34 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setuptools/_distutils/spawn.py.orig 2021-03-19 19:19:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setuptools/_distutils/spawn.py 2021-03-19 19:54:58.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,11 +64,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # than that used when the interpreter was built. This ensures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # extension modules are built with correct compatibility values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/pypa/distutils/pull/36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a73b8b9..b012d00 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setuptools/_distutils/spawn.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setuptools/_distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,17 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if _cfg_target:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if _cfg_target:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # ensure that the deployment target of build process is not less
</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;'>++ # Ensure that the deployment target of the build process is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # less than 10.3 if the interpreter was built for 10.3 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # This ensures extension modules are built with correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # compatibility values, specifically LDSHARED which can use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # '-undefined dynamic_lookup' which only works on >= 10.3.
</span> cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
- if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- raise DistutilsPlatformError(my_msg)
</span> + cur_target_split = [int(x) for x in cur_target.split('.')]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if _cfg_target_split > cur_target_split:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Before macOS 11 Big Sur, major OS version was 10.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Now it's 11, 12, etc. But Big Sur can sometimes identify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # itself as 10.16 for compatibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_majors = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for vers in [_cfg_target_split, cur_target_split]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if vers[0] >= 11:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_majors.append(vers[0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif (vers[0], vers[1]) == (10, 16):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_majors.append(11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_majors.append((vers[0], vers[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if target_majors[0] != target_majors[1]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # not just a difference in minor version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise DistutilsPlatformError(my_msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if _cfg_target_split[:2] >= [10, 3] and cur_target_split[:2] < [10, 3]:
</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;'>++ 'now "%s" but "%s" during configure;'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'must use 10.3 or later'
</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> env.update(MACOSX_DEPLOYMENT_TARGET=cur_target)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span></pre><pre style='margin:0'>
</pre>