<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/b98080365d70f4338fcfc210c88fafb806f57a72">https://github.com/macports/macports-ports/commit/b98080365d70f4338fcfc210c88fafb806f57a72</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 b98080365d7 python310-devel: update to 3.10.0b1
</span>b98080365d7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b98080365d70f4338fcfc210c88fafb806f57a72
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat May 8 04:07:23 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python310-devel: update to 3.10.0b1
</span>---
lang/python310-devel/Portfile | 11 ++++----
.../python310-devel/files/distutils_spawn.py.patch | 29 ----------------------
lang/python310-devel/files/patch-setup.py.diff | 22 ++++++++++++----
3 files changed, 22 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/Portfile b/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 246ff012538..eb38f072921 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python310-devel
# Remember to keep py310-tkinter and py310-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.10.0a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.0b1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,16 @@ master_sites ${homepage}ftp/python/3.10.0/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 541c60c4eac4ef59baa4e5dcfe0fad0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 64f93b09fe81a8d8066c8f0079318501db0063f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 513199724498513e7098c46bf6442192f5ffef32478d92499704aeeff3516db2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 8a1d22cc68dccffab13f5e2e0d005ef0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2775e624181180a3b4efd0e06af9b5f8e77fef24 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a30c55b26a91f4c76392ba2b2e87c2d591fdb2b36f7b58d39fe90bd400fef1a3
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-configure-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/distutils_spawn.py.patch b/lang/python310-devel/files/distutils_spawn.py.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8403b095101..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/pypa/distutils/pull/36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/distutils/spawn.py b/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a73b8b9..b012d00 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- if _cfg_target:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if _cfg_target:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # ensure that the deployment target of build process is not less
</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:#ffe0e0;'>-+ # Ensure that the deployment target of the build process is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # less than 10.3 if the interpreter was built for 10.3 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This ensures extension modules are built with correct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # compatibility values, specifically LDSHARED which can use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # '-undefined dynamic_lookup' which only works on >= 10.3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_split = [int(x) for x in cur_target.split('.')]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if _cfg_target_split[:2] >= [10, 3] and cur_target_split[:2] < [10, 3]:
</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;'>-+ 'now "%s" but "%s" during configure;'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'must use 10.3 or later'
</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:#ffe0e0;'>- env = dict(os.environ,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/patch-setup.py.diff b/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 049b2887e99..fc11135e61b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-02-03 07:45:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-02-06 10:00:54.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-05-04 05:34:56.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-05-08 03:55:18.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span> TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes')
# This global variable is used to hold the list of modules to be disabled.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
# --list-module-names option used by Tools/scripts/generate_module_names.py
LIST_MODULE_NAMES = False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -787,9 +787,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -800,9 +800,6 @@
</span> # Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,19 @@
</span> # only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2045,8 +2042,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1839,10 +1836,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build the _uuid module if possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if uuid_incs is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uuid_libs = ['uuid']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uuid_libs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uuid_libs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.add(Extension('_uuid', ['_uuidmodule.c'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libraries=uuid_libs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_dirs=uuid_incs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2082,8 +2076,8 @@
</span> # Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
</pre><pre style='margin:0'>
</pre>