Merge pull request #656 from ismail/main

Update to Python 3.12.1

.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml

@@ -9,15 +9,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge python_debug
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 expat:
 - '2'
 libffi:

.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml

@@ -9,15 +9,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 expat:
 - '2'
 libffi:

.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml

@@ -7,15 +7,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge python_debug
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 expat:
 - '2'
 libffi:

.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml

@@ -7,15 +7,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 expat:
 - '2'
 libffi:

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.12.0" %}
+{% set version = "3.12.1" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -46,7 +46,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
-    md5: f6f4616584b23254d165f4db90c247d6
+    md5: 50f827c800483776c8ef86e6a53831fa
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -72,6 +72,7 @@ source:
       - patches/0019-Remove-unused-readelf.patch
       - patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
       - patches/0021-Override-configure-LIBFFI.patch
+      - patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch
 
 build:
   number: {{ build_number }}
@@ -255,6 +256,8 @@ outputs:
         - python3.1 --version  # [unix]
         # Test for segfault on osx-64 with libffi=3.4, see https://bugs.python.org/issue44556
         - python -c "from ctypes import CFUNCTYPE; CFUNCTYPE(None)(id)"
+        # Test for wide character supported via ncursesw
+        - TERM=xterm >/dev/null python -c "import curses; scr = curses.initscr(); curses.unget_wch('x'); assert 'x' ==  scr.get_wch()"  # [unix]
 
   - name: libpython-static
     script: build_static.sh  # [unix]

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,18 +1,18 @@
-From 9c65249a545fe5c296a72d6b823d9d3243253be7 Mon Sep 17 00:00:00 2001
+From bc1199982480a1e81997bce616ea2fefccab6075 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 01/21] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/22] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
  Modules/selectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index a88c3cb815..c92432b578 100644
+index b7c6b1b539..28724a1bf3 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
-@@ -38,7 +38,7 @@
+@@ -46,7 +46,7 @@
     FD_SETSIZE higher before this; e.g., via compiler /D switch.
  */
  #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)

recipe/patches/0002-Win32-Do-not-download-externals.patch

@@ -1,7 +1,7 @@
-From f1e63f55ede50edbac1e8135375ba3985eab141d Mon Sep 17 00:00:00 2001
+From 3125b6dea5c3cc6c58643877d0a3d7006a819a91 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
-Subject: [PATCH 02/21] Win32: Do not download externals
+Subject: [PATCH 02/22] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-

recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch

@@ -1,7 +1,7 @@
-From 26c9a5f3c60ebf2513bdbde146eda9c23720fd4e Mon Sep 17 00:00:00 2001
+From f7a704ce263502b82d199fe3595129b6ce2c89b7 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
-Subject: [PATCH 03/21] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib
  first
 
 ---

recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch

@@ -1,7 +1,7 @@
-From 3764b2e5a0373e1b5611e84fcae69c8354cff7d6 Mon Sep 17 00:00:00 2001
+From 81cfd0418e87a8d4a219c1ff1c99277e45a53f08 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
-Subject: [PATCH 04/21] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 04/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<[email protected]>

recipe/patches/0005-Unvendor-openssl.patch

@@ -1,7 +1,7 @@
-From 4caed7d1cc16c2c7cbc151297aa27d1e51f30f87 Mon Sep 17 00:00:00 2001
+From 40b8c4fdcc8280e55685a8b8108a8e7f5844a148 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <[email protected]>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
-Subject: [PATCH 05/21] Unvendor openssl
+Subject: [PATCH 05/22] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <[email protected]>
 ---
@@ -144,7 +144,7 @@ index 0da6f67495..17eee400eb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 35c6e92be4..cf0913f331 100644
+index 496bc3dd4c..cf0913f331 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -61,6 +61,7 @@
@@ -159,7 +159,7 @@ index 35c6e92be4..cf0913f331 100644
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
 
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.1.0\</sqlite3Dir>
 -    <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
 -    <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
 -    <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>

recipe/patches/0006-Unvendor-sqlite3.patch

@@ -1,7 +1,7 @@
-From b39c8fd16e03f7f177f7854f65f0c2d3dccd03d1 Mon Sep 17 00:00:00 2001
+From 4108d78cd940ee376fb6ca75fa4765dbabfdb167 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <[email protected]>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
-Subject: [PATCH 06/21] Unvendor sqlite3
+Subject: [PATCH 06/22] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,7 +1,7 @@
-From ea4bacd76a8b7845ea62dec463d37cc097d7fb9c Mon Sep 17 00:00:00 2001
+From 4993f88dbfae5ffd0917d66d4b7857014ed8c098 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <[email protected]>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
-Subject: [PATCH 07/21] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 07/22] Add CondaEcosystemModifyDllSearchPath()
 
   The python interpreter is modifed so that it works as if the python interpreter
   was called with the following conda directories.
@@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <[email protected]>
  1 file changed, 96 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index 29771e07ae..04b4733098 100644
+index a0130fde15..e690dcf7df 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -51,6 +51,10 @@