diff --git a/README.anaconda.md b/README.anaconda.md
index ff819534..e3deb129 100644
--- a/README.anaconda.md
+++ b/README.anaconda.md
@@ -7,9 +7,8 @@ plan that you should follow.
 
 **On each supported platform do the following:**
 
-1. Push your newly built python package to our testing channel (`c3i_test2`).
-2. Create a new Conda environment using this new python version: `conda create -n test -c c3i_test2 python=VERSION`
-3. Make sure interactive python works, and can import some built in modules (`re`, `math`, `os`):
+1. Create a new Conda environment using this new python version: `conda create -n test python=VERSION`
+2. Make sure interactive python works, and can import some built in modules (`re`, `math`, `os`):
 ```
 $ python -i
 Python 3.8.8 (default, Apr 13 2021, 12:59:45)
@@ -18,5 +17,5 @@ Type "help", "copyright", "credits" or "license" for more information.
 >>> import re
 >>>
 ```
-4. Make sure that the standard http server doesn't throw errors: `python -m http.server --bind 127.0.0.1`
-5. `conda-build` a python dependent package with this version of python. Good examples are `pyarrow` or `scipy`.
+3. Make sure that the standard http server doesn't throw errors: `python -m http.server --bind 127.0.0.1`
+4. `conda-build` a python dependent package with this version of python. Good examples are `pyarrow` or `scipy`.
diff --git a/abs.yaml b/abs.yaml
index a555370a..fc245fb9 100644
--- a/abs.yaml
+++ b/abs.yaml
@@ -4,3 +4,6 @@ build_parameters:
   #- "--skip-existing"
   - "--error-overlinking"
   - "--error-overdepending"
+
+build_env_vars:
+  ANACONDA_ROCKET_ENABLE_PY315 : yes
diff --git a/recipe/build_base.bat b/recipe/build_base.bat
index 8dd555e5..e27d50fb 100644
--- a/recipe/build_base.bat
+++ b/recipe/build_base.bat
@@ -25,6 +25,15 @@ for /F "tokens=1,2 delims=." %%i in ("%PKG_VERSION%") do (
   if NOT "%PY_VER%"=="%%i.%%j" exit 1
 )
 
+:: Pin Tcl/Tk to conda tk 8.6 (upstream 3.15 defaults to Tcl 9.0.3.0)
+for /f "usebackq delims=" %%i in (`conda list -p %PREFIX% tk --no-show-channel-urls --json ^| findstr "version"`) do set TK_VERSION_LINE=%%i
+for /f "tokens=2 delims==/ " %%i IN ('echo %TK_VERSION_LINE%') do (set TK_VERSION=%%~i)
+echo TK_VERSION detected as %TK_VERSION%.0
+set TCLTK_MSBUILD_PROPS="/p:TclVersion=%TK_VERSION%.0" "/p:TkVersion=%TK_VERSION%.0"
+
+cd PCbuild
+call build.bat %PGO% %CONFIG% %FREETHREADING% -m -e -v -p %PLATFORM% %TCLTK_MSBUILD_PROPS%
+
 for /f "usebackq delims=" %%i in (`conda list -p %PREFIX% sqlite --no-show-channel-urls --json ^| findstr "version"`) do set SQLITE3_VERSION_LINE=%%i
 for /f "tokens=2 delims==/ " %%i IN ('echo %SQLITE3_VERSION_LINE%') do (set SQLITE3_VERSION=%%~i)
 echo SQLITE3_VERSION detected as %SQLITE3_VERSION%
diff --git a/recipe/build_base.sh b/recipe/build_base.sh
index 948f2031..2cfa044b 100644
--- a/recipe/build_base.sh
+++ b/recipe/build_base.sh
@@ -419,7 +419,7 @@ ln -s ${PREFIX}/bin/pydoc${VER} ${PREFIX}/bin/pydoc
 # Workaround for https://github.com/conda/conda/issues/10969 -
 # specifically for conda<=4.10
 # https://github.com/conda/conda/issues/11423#issuecomment-1104253815
-ln -s ${PREFIX}/bin/python3.14 ${PREFIX}/bin/python3.1
+ln -s ${PREFIX}/bin/python${VER} ${PREFIX}/bin/python3.1
 
 # Remove test data to save space
 # Though keep `support` as some things use that.
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 218f9494..b8c77e32 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -1,9 +1,9 @@
 python:
-  - 3.14
+  - 3.15
 python_impl:
   - cpython
 numpy:
-  - 2.3
+  - 2.5
 gil_type:
   - normal
   # Will be enabled as part of https://anaconda.atlassian.net/browse/PKG-5855
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 83a4f4c9..de9c55e9 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
-{% set version = "3.14.6" %}
-{% set dev = "" %}
+{% set version = "3.15.0" %}
+{% set dev = "b3" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -61,7 +61,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 }}/
-    sha256: 143b1dddefaec3bd2e21e3b839b34a2b7fb9842272883c576420d605e9f30c63
+    sha256: 6a935ae234a67e6549894373b0cfeb8361182d03b21442328ae9598ab7422127
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -193,10 +193,10 @@ outputs:
 {% endif %}
         # https://github.com/python/cpython/blob/main/Tools/jit/README.md#installing-llvm:
         # "LLVM version 21 is the officially supported version"
-        - clang-19         # [not win]
-        - llvm-tools-19    # [not win]
-        - clang 19.*       # [win]
-        - llvm-tools 19.*  # [win]
+        - clang-21         # [not win]
+        - llvm-tools-21    # [not win]
+        - clang 21.*       # [win]
+        - llvm-tools 21.*  # [win]
       host:
         - bzip2 {{ bzip2 }}
         - sqlite {{ sqlite }}
@@ -247,6 +247,7 @@ outputs:
         - tests/cython/*
         - tests/prefix-replacement/*
         - run_test.py
+        - run_test_py315.py
       commands:
         - echo on  # [win]
         - set  # [win]
@@ -300,6 +301,8 @@ outputs:
         - popd
         - popd
         - python run_test.py
+        - export RUN_TEST_REQUIRE_315=1 && python run_test_py315.py   # [unix]
+        - set RUN_TEST_REQUIRE_315=1 && python run_test_py315.py      # [win]
         - test ! -f default.profraw   # [osx]
         # Test workaround for https://github.com/conda/conda/issues/10969
         - python3.1 --version  # [unix]
@@ -312,6 +315,8 @@ outputs:
     script: build_static.bat  # [win]
     build:
       number: {{ build_number }}
+      force_use_keys:
+        - gil_type
       activate_in_script: true
       ignore_run_exports:
         - python_abi
diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
index e3643c65..08fa0424 100644
--- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
+++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -1,4 +1,4 @@
-From 285d30e99ac555177c551c112798cc79720f676e Mon Sep 17 00:00:00 2001
+From f43869001705b6d14f777f1bdb7a6d53dd4edd96 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
 Subject: [PATCH 01/24] Win32: Change FD_SETSIZE from 512 to 2048
@@ -9,10 +9,10 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index d234d504cb5..3856307c611 100644
+index 2c56dbc6a54..845ff4732ca 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
     FD_SETSIZE higher before this; e.g., via compiler /D switch.
  */
  #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
@@ -22,5 +22,5 @@ index d234d504cb5..3856307c611 100644
  
  #if defined(HAVE_POLL_H)
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch
index b88ab17a..d5c01c27 100644
--- a/recipe/patches/0002-Win32-Do-not-download-externals.patch
+++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch
@@ -1,4 +1,4 @@
-From 2e62556e56120f7b6d15ba97fdf8733deebb9ea9 Mon Sep 17 00:00:00 2001
+From 1faa47b5f8c0ca3aa98ee0e3bb317106458bd514 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
 Subject: [PATCH 02/24] Win32: Do not download externals
@@ -8,18 +8,18 @@ Subject: [PATCH 02/24] Win32: Do not download externals
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/PCbuild/build.bat b/PCbuild/build.bat
-index 60235704886..867a352057f 100644
+index 9d2f032f5a9..f0629639913 100644
 --- a/PCbuild/build.bat
 +++ b/PCbuild/build.bat
-@@ -113,7 +113,7 @@ if "%IncludeSSL%"=="" set IncludeSSL=true
+@@ -118,7 +118,7 @@ if "%IncludeSSL%"=="" set IncludeSSL=true
  if "%IncludeTkinter%"=="" set IncludeTkinter=true
  if "%UseJIT%" NEQ "true" set IncludeLLVM=false
  
 -if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
 +rem if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
  
- if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" (
-     if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" (
+ if /I "%target%"=="Clean" set clean=true
+ if /I "%target%"=="CleanAll" set clean=true
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
index 8b861ae9..099d5936 100644
--- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
+++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
@@ -1,4 +1,4 @@
-From c48a3c1cc321e00bd361f5fce271a18c03c4a202 Mon Sep 17 00:00:00 2001
+From 054ec3e5926c29850db8d0cae3aaebc2670bfccb Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
 Subject: [PATCH 03/24] Fix find_library so that it looks in sys.prefix/lib
@@ -25,10 +25,10 @@ index 583c47daff3..ab9b01c87e2 100644
          yield os.path.join(executable_path, name[len('@executable_path/'):])
  
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 378f12167c6..bf45580ab9f 100644
+index 35ac5b6bfd6..09c3e1703dc 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -129,7 +129,8 @@ def dllist():
+@@ -136,7 +136,8 @@ def dllist():
  elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
      from ctypes.macholib.dyld import dyld_find as _dyld_find
      def find_library(name):
@@ -38,7 +38,7 @@ index 378f12167c6..bf45580ab9f 100644
                      '%s.dylib' % name,
                      '%s.framework/%s' % (name, name)]
          for name in possible:
-@@ -430,10 +431,30 @@ def _findLib_ld(name):
+@@ -437,10 +438,30 @@ def _findLib_ld(name):
                  pass  # result will be None
              return result
  
@@ -72,5 +72,5 @@ index 378f12167c6..bf45580ab9f 100644
  
  # Listing loaded libraries on other systems will try to use
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
index 7d9bc9c4..5762a5b2 100644
--- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
+++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
@@ -1,4 +1,4 @@
-From 4435da9460f82ce6c96c4b92f58eab6edfc90da1 Mon Sep 17 00:00:00 2001
+From 41b486c6f4a3028836368f79711da6f5934f9386 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
 Subject: [PATCH 04/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
@@ -25,7 +25,7 @@ index 1e75993480a..ff96c8e1990 100644
          !progname_to_dict(dict, "real_executable") ||
          !library_to_dict(dict, "library") ||
 diff --git a/Modules/getpath.py b/Modules/getpath.py
-index b89d7427e3f..21df0efac12 100644
+index 6199567bd77..ea370c2f686 100644
 --- a/Modules/getpath.py
 +++ b/Modules/getpath.py
 @@ -52,6 +52,7 @@
@@ -36,9 +36,9 @@ index b89d7427e3f..21df0efac12 100644
  
  # ** Values calculated at runtime **
  # config            -- [in/out] dict of the PyConfig structure
-@@ -704,7 +705,7 @@ def search_up(prefix, *landmarks, test=isfile):
-     else:
-         pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK))
+@@ -699,7 +700,7 @@ def search_up(prefix, *landmarks, test=isfile):
+         stdlib_zip = joinpath(base_prefix, ZIP_LANDMARK)
+     pythonpath.append(stdlib_zip)
  
 -    if os_name == 'nt' and use_environment and winreg:
 +    if os_name == 'nt' and use_environment and winreg and ENV_CONDA_PY_ALLOW_REG_PATHS and ENV_CONDA_PY_ALLOW_REG_PATHS != '0':
@@ -1197,5 +1197,5 @@ index 00000000000..a73ea8a0e91
 +    return hPython3 != NULL;
 +}
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
index 375f230e..1cc08c36 100644
--- a/recipe/patches/0005-Unvendor-openssl.patch
+++ b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,22 +1,22 @@
-From 04cfcc1728485e2fbdd04f1c34425e8377b72c61 Mon Sep 17 00:00:00 2001
-From: Nehal J Wani <nehaljw.kkd1@gmail.com>
-Date: Sat, 24 Nov 2018 20:38:02 -0600
-Subject: [PATCH 05/24] Unvendor openssl
-
-Co-authored-by: Isuru Fernando <isuruf@gmail.com>
----
- PCbuild/openssl.props   | 14 ++------------
- PCbuild/openssl.vcxproj | 32 --------------------------------
- PCbuild/python.props    | 27 ++++++++++++++-------------
- PCbuild/python.vcxproj  |  3 +++
- PCbuild/pythonw.vcxproj |  3 +++
- 5 files changed, 22 insertions(+), 57 deletions(-)
-
-diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
-index 5fd708b211e..044cefd95ea 100644
---- a/PCbuild/openssl.props
-+++ b/PCbuild/openssl.props
-@@ -2,10 +2,10 @@
+From 0642618fc60bb673e0336ba43e0ac790d46b0913 Mon Sep 17 00:00:00 2001
+From: Nehal J Wani <nehaljw.kkd1@gmail.com>
+Date: Sat, 24 Nov 2018 20:38:02 -0600
+Subject: [PATCH 05/24] Unvendor openssl
+
+Co-authored-by: Isuru Fernando <isuruf@gmail.com>
+---
+ PCbuild/openssl.props   | 14 ++------------
+ PCbuild/openssl.vcxproj | 32 --------------------------------
+ PCbuild/python.props    | 13 +------------
+ PCbuild/python.vcxproj  |  3 +++
+ PCbuild/pythonw.vcxproj |  3 +++
+ 5 files changed, 9 insertions(+), 56 deletions(-)
+
+diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
+index 5fd708b211e..044cefd95ea 100644
+--- a/PCbuild/openssl.props
++++ b/PCbuild/openssl.props
+@@ -2,10 +2,10 @@
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemDefinitionGroup>
      <ClCompile>
@@ -29,7 +29,7 @@ index 5fd708b211e..044cefd95ea 100644
        <AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
-@@ -21,14 +21,4 @@
+@@ -21,14 +21,4 @@
      <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" />
      <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" />
    </ItemGroup>
@@ -44,11 +44,11 @@ index 5fd708b211e..044cefd95ea 100644
 -    <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
 -  </Target>
  </Project>
-diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
-index 7ca750dda8f..17eee400ebb 100644
---- a/PCbuild/openssl.vcxproj
-+++ b/PCbuild/openssl.vcxproj
-@@ -60,40 +60,8 @@
+diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
+index 7ca750dda8f..17eee400ebb 100644
+--- a/PCbuild/openssl.vcxproj
++++ b/PCbuild/openssl.vcxproj
+@@ -60,40 +60,8 @@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <Import Project="pyproject.props" />
  
@@ -89,11 +89,11 @@ index 7ca750dda8f..17eee400ebb 100644
    <Target Name="Clean" />
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
-diff --git a/PCbuild/python.props b/PCbuild/python.props
-index ce4a7781fbd..253aa66f477 100644
---- a/PCbuild/python.props
-+++ b/PCbuild/python.props
-@@ -68,6 +68,7 @@
+diff --git a/PCbuild/python.props b/PCbuild/python.props
+index 8d931bba28a..744ce0c540a 100644
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -91,6 +91,7 @@
    <!-- Directories of external projects. tcltk is handled in tcltk.props -->
    <PropertyGroup>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
@@ -101,13 +101,13 @@ index ce4a7781fbd..253aa66f477 100644
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
    </PropertyGroup>
-@@ -75,20 +76,8 @@
+@@ -98,20 +99,8 @@
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
  
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.50.4.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.53.2.0\</sqlite3Dir>
 -    <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
--    <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
+-    <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.8.1.1\</lzmaDir>
 -    <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
@@ -122,11 +122,11 @@ index ce4a7781fbd..253aa66f477 100644
    </PropertyGroup>
  
    <PropertyGroup>
-diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
-index 70dabaa3c8b..255be6ab910 100644
---- a/PCbuild/python.vcxproj
-+++ b/PCbuild/python.vcxproj
-@@ -110,6 +110,9 @@
+diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
+index 417ede34c54..c73404ad2ad 100644
+--- a/PCbuild/python.vcxproj
++++ b/PCbuild/python.vcxproj
+@@ -110,6 +110,9 @@
    </ItemGroup>
    <ItemGroup>
      <ClCompile Include="..\Programs\python.c" />
@@ -136,11 +136,11 @@ index 70dabaa3c8b..255be6ab910 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
-diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index c6a5b8ce90a..8645a7bf438 100644
---- a/PCbuild/pythonw.vcxproj
-+++ b/PCbuild/pythonw.vcxproj
-@@ -105,6 +105,9 @@
+diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
+index 244cdf622ad..03376ab24fd 100644
+--- a/PCbuild/pythonw.vcxproj
++++ b/PCbuild/pythonw.vcxproj
+@@ -105,6 +105,9 @@
    </ItemGroup>
    <ItemGroup>
      <ClCompile Include="..\PC\WinMain.c" />
@@ -151,5 +151,5 @@ index c6a5b8ce90a..8645a7bf438 100644
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
index ca5009ef..36759702 100644
--- a/recipe/patches/0006-Unvendor-sqlite3.patch
+++ b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,4 +1,4 @@
-From d5656337151f4e876436e7baa7dc01b4f907c5b6 Mon Sep 17 00:00:00 2001
+From 3f1f9787e7e3a15dd7e490666d338fd4aaf9ed5f Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
 Subject: [PATCH 06/24] Unvendor sqlite3
@@ -39,10 +39,10 @@ index 9ae0a0fc3a0..9baaafed518 100644
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
-index 7296ea75301..a7f716ff105 100644
+index 09a989d3864..086ca1132c0 100644
 --- a/PCbuild/pcbuild.sln
 +++ b/PCbuild/pcbuild.sln
-@@ -98,8 +98,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj"
+@@ -99,8 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
  EndProject
@@ -75,5 +75,5 @@ index f12ec348b37..f9e5e449a49 100644
    <ItemDefinitionGroup>
      <ClCompile>
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
index a30d498d..3c3f7f14 100644
--- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
+++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,4 +1,4 @@
-From 9acbf2d73db9c5cbca2c31d913411994b809cf89 Mon Sep 17 00:00:00 2001
+From 9ecc3565406cd6fb0c9d1c8844e5612a2cd434d2 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
 Subject: [PATCH 07/24] Add CondaEcosystemModifyDllSearchPath()
@@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  1 file changed, 95 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index 352787c6495..4fd4fcb0f6e 100644
+index 3933c321ed2..9a4a8c5a024 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
-@@ -80,6 +80,10 @@
+@@ -88,6 +88,10 @@
  
  #ifdef MS_WINDOWS
  #  undef BYTE
@@ -47,7 +47,7 @@ index 352787c6495..4fd4fcb0f6e 100644
  #endif
  
  #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
-@@ -114,6 +118,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
+@@ -122,6 +126,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
  = _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie);
  _Py_COMP_DIAG_POP
  
@@ -141,7 +141,7 @@ index 352787c6495..4fd4fcb0f6e 100644
  
  static int runtime_initialized = 0;
  
-@@ -131,6 +222,10 @@ _PyRuntime_Initialize(void)
+@@ -139,6 +230,10 @@ _PyRuntime_Initialize(void)
      }
      runtime_initialized = 1;
  
@@ -153,5 +153,5 @@ index 352787c6495..4fd4fcb0f6e 100644
  }
  
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch
index 74b90e34..4632271e 100644
--- a/recipe/patches/0008-Doing-d1trimfile.patch
+++ b/recipe/patches/0008-Doing-d1trimfile.patch
@@ -1,4 +1,4 @@
-From 6250a23c4f7ca2373a6f3208deaaf1cc26f12eb5 Mon Sep 17 00:00:00 2001
+From 8f9b456a08af486bc5a7309a173fdeca29cf0b2c Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 21:47:47 +0100
 Subject: [PATCH 08/24] Doing d1trimfile
@@ -140,7 +140,7 @@ index f15b80852e3..e565441ca4c 100644
      <ClInclude Include="..\Modules\_ctypes\_ctypes_test.h" />
      <ClInclude Include="..\Modules\_ctypes\_ctypes_test_generated.c.h" />
 diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
-index ee7421484b5..e9d60b4db1a 100644
+index 3ba49370d58..921d22e47b3 100644
 --- a/PCbuild/_decimal.vcxproj
 +++ b/PCbuild/_decimal.vcxproj
 @@ -99,6 +99,10 @@
@@ -172,7 +172,7 @@ index 3eb9c89bcb6..920656f2ee2 100644
    </ItemDefinitionGroup>
    <ItemGroup>
 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
-index 5ceddf759b8..6b113ad8c2e 100644
+index 17b98c9d9ec..b3998a47f22 100644
 --- a/PCbuild/_freeze_module.vcxproj
 +++ b/PCbuild/_freeze_module.vcxproj
 @@ -93,6 +93,10 @@
@@ -394,7 +394,7 @@ index 4e721e8ce09..048adde0951 100644
      <ClCompile Include="..\Modules\_testbuffer.c" />
    </ItemGroup>
 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
-index a68f15d25aa..5c42f15c312 100644
+index 64e50b67be4..83233bfe869 100644
 --- a/PCbuild/_testcapi.vcxproj
 +++ b/PCbuild/_testcapi.vcxproj
 @@ -92,6 +92,26 @@
@@ -486,7 +486,7 @@ index c35ac83c1c7..c9d7f5d22b7 100644
      <ClCompile Include="..\Modules\_testimportmultiple.c" />
    </ItemGroup>
 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj
-index f7e050b7c74..58c3e10c0f0 100644
+index f3e423fa046..ac285717998 100644
 --- a/PCbuild/_testinternalcapi.vcxproj
 +++ b/PCbuild/_testinternalcapi.vcxproj
 @@ -92,6 +92,26 @@
@@ -547,11 +547,11 @@ index 87f6005fffc..de9358312ac 100644
      <Link>
        <AdditionalDependencies>$(tcltkLib);%(AdditionalDependencies)</AdditionalDependencies>
 diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj
-index 97938692328..64b1d443cfa 100644
+index 75d4e162346..f54587584b0 100644
 --- a/PCbuild/liblzma.vcxproj
 +++ b/PCbuild/liblzma.vcxproj
 @@ -95,6 +95,11 @@
-       <AdditionalIncludeDirectories>$(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <DisableSpecificWarnings>4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
        <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-deprecated-declarations</AdditionalOptions>
 +      <DisableSpecificWarnings>4028;4113;4133;4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -563,13 +563,13 @@ index 97938692328..64b1d443cfa 100644
    </ItemDefinitionGroup>
    <ItemGroup>
 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
-index dc9161a8b29..3bcef600a3e 100644
+index 8e0f5f63112..7a1d5942a6c 100644
 --- a/PCbuild/pyexpat.vcxproj
 +++ b/PCbuild/pyexpat.vcxproj
 @@ -92,6 +92,10 @@
      <ClCompile>
        <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -608,7 +608,7 @@ index ea432d6bc9a..13bc6921030 100644
      <Link>
        <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
-index 255be6ab910..08c5c877d81 100644
+index c73404ad2ad..30312dd6384 100644
 --- a/PCbuild/python.vcxproj
 +++ b/PCbuild/python.vcxproj
 @@ -92,6 +92,10 @@
@@ -623,7 +623,7 @@ index 255be6ab910..08c5c877d81 100644
      <Link>
        <SubSystem>Console</SubSystem>
 diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
-index 235ea1cf9d3..60cafdbb5db 100644
+index 3d8ac1b2353..8f8da3d0bb0 100644
 --- a/PCbuild/python3dll.vcxproj
 +++ b/PCbuild/python3dll.vcxproj
 @@ -93,6 +93,10 @@
@@ -651,7 +651,7 @@ index 3f8772d30b4..d80968e351a 100644
      <Link>
        <AdditionalDependencies>windowsapp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index b911c938563..11c2bd350a8 100644
+index e255ed5af19..b455b3089ca 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
 @@ -99,11 +99,11 @@
@@ -670,7 +670,7 @@ index b911c938563..11c2bd350a8 100644
        <PreprocessorDefinitions Condition="'$(UseJIT)' == 'true'">_Py_JIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <PreprocessorDefinitions Condition="'$(UseTIER2)' != '' and '$(UseTIER2)' != '0'">_Py_TIER2=$(UseTIER2);%(PreprocessorDefinitions)</PreprocessorDefinitions>
 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index 8645a7bf438..345ef48dfe2 100644
+index 03376ab24fd..6437dfa6a90 100644
 --- a/PCbuild/pythonw.vcxproj
 +++ b/PCbuild/pythonw.vcxproj
 @@ -96,6 +96,18 @@
@@ -775,12 +775,12 @@ index 781f938e2ab..714a2382c1e 100644
      <ClInclude Include="..\Modules\unicodedata_db.h" />
      <ClInclude Include="..\Modules\unicodename_db.h" />
 diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj
-index abaf3a979af..324aadcd782 100644
+index a2e8ffa82b1..705e507050f 100644
 --- a/PCbuild/venvlauncher.vcxproj
 +++ b/PCbuild/venvlauncher.vcxproj
-@@ -94,6 +94,10 @@
+@@ -97,6 +97,10 @@
      <ClCompile>
-       <PreprocessorDefinitions>EXENAME=L"$(PyExeName)$(PyDebugExt).exe";_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>EXENAME=L"$(ExeName)";_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -790,12 +790,12 @@ index abaf3a979af..324aadcd782 100644
      <ResourceCompile>
        <PreprocessorDefinitions>PY_ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj
-index c58280deb8a..4dacf7f2724 100644
+index f2aaf83fe2b..d9c47683f25 100644
 --- a/PCbuild/venvwlauncher.vcxproj
 +++ b/PCbuild/venvwlauncher.vcxproj
-@@ -94,6 +94,10 @@
+@@ -97,6 +97,10 @@
      <ClCompile>
-       <PreprocessorDefinitions>EXENAME=L"$(PyWExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>EXENAME=L"$(ExeName)";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
 +      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -828,7 +828,7 @@ index c26029b15a3..d76a3fb8537 100644
    <ItemGroup>
      <ClCompile Include="..\PC\winsound.c" />
 diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj
-index 093e6920c0b..19dd43c19c2 100644
+index f0c36166001..cc906a14cf4 100644
 --- a/PCbuild/xxlimited.vcxproj
 +++ b/PCbuild/xxlimited.vcxproj
 @@ -93,6 +93,12 @@
@@ -845,7 +845,7 @@ index 093e6920c0b..19dd43c19c2 100644
        <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
 diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj
-index 3f4d4463f24..2572449ba0c 100644
+index bfaf4e25366..4f8a3b37e35 100644
 --- a/PCbuild/xxlimited_35.vcxproj
 +++ b/PCbuild/xxlimited_35.vcxproj
 @@ -93,6 +93,12 @@
@@ -862,5 +862,5 @@ index 3f4d4463f24..2572449ba0c 100644
        <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch b/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch
index 8d56eff8..abbfc33a 100644
--- a/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch
+++ b/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch
@@ -1,4 +1,4 @@
-From a2054d6e5d86c729547a5e23ef1509f70565c4a3 Mon Sep 17 00:00:00 2001
+From d91f0d65d9c9d1112cc44bfa30fad26f8379873c Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Thu, 26 Nov 2020 18:47:37 +0000
 Subject: [PATCH 09/24] Allow cross compiling for Darwin
@@ -9,10 +9,10 @@ Subject: [PATCH 09/24] Allow cross compiling for Darwin
  2 files changed, 6 insertions(+)
 
 diff --git a/configure b/configure
-index d31c24dffa2..63aba6d8004 100755
+index e60a71cff46..663ac7a6492 100755
 --- a/configure
 +++ b/configure
-@@ -4110,6 +4110,9 @@ then
+@@ -4155,6 +4155,9 @@ then
  	*-*-linux*)
  		ac_sys_system=Linux
  		;;
@@ -23,10 +23,10 @@ index d31c24dffa2..63aba6d8004 100755
  		ac_sys_system=Cygwin
  		;;
 diff --git a/configure.ac b/configure.ac
-index af7a9623d7b..5f6a0622f37 100644
+index c6485093032..3f18cd6ab3a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -324,6 +324,9 @@ then
+@@ -333,6 +333,9 @@ then
  	*-*-linux*)
  		ac_sys_system=Linux
  		;;
@@ -37,5 +37,5 @@ index af7a9623d7b..5f6a0622f37 100644
  		ac_sys_system=Cygwin
  		;;
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch
index a64802dc..5c3473ad 100644
--- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch
+++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch
@@ -1,4 +1,4 @@
-From 6a6f59eed43a4ef714df3b63a9d640f5c5c99ea3 Mon Sep 17 00:00:00 2001
+From 6c068469e0422e69e53b589fcb73aca7d429eb94 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
 Subject: [PATCH 10/24] Fix TZPATH on windows
@@ -8,10 +8,10 @@ Subject: [PATCH 10/24] Fix TZPATH on windows
  1 file changed, 1 insertion(+)
 
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 2ecbff222fe..54d37a5d4e7 100644
+index 47415adce04..78659c358db 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
-@@ -555,6 +555,7 @@ def _init_config_vars():
+@@ -550,6 +550,7 @@ def _init_config_vars():
      if os.name == 'nt':
          _init_non_posix(_CONFIG_VARS)
          _CONFIG_VARS['VPATH'] = sys._vpath
@@ -20,5 +20,5 @@ index 2ecbff222fe..54d37a5d4e7 100644
          # Setting 'userbase' is done below the call to the
          # init function to enable using 'get_config_var' in
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
index 0180a21c..248041b4 100644
--- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
+++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
@@ -1,4 +1,4 @@
-From 5184883c466b51542757b62ef0450081b69e5851 Mon Sep 17 00:00:00 2001
+From 95e5c05333231ac6e321129154417c777f95df3d Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
 Subject: [PATCH 11/24] Make dyld search work with SYSTEM_VERSION_COMPAT=1
@@ -15,10 +15,10 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index 856b0376e5e..2c09548ec1c 100644
+index ccc57e347b0..427b9094799 100644
 --- a/Modules/_ctypes/callproc.c
 +++ b/Modules/_ctypes/callproc.c
-@@ -1509,7 +1509,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
+@@ -1503,7 +1503,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
  #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
  #  ifdef HAVE_BUILTIN_AVAILABLE
  #    define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
@@ -28,5 +28,5 @@ index 856b0376e5e..2c09548ec1c 100644
  #    define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
           (_dyld_shared_cache_contains_path != NULL)
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch
index 27864105..27428ad4 100644
--- a/recipe/patches/0012-Unvendor-bzip2.patch
+++ b/recipe/patches/0012-Unvendor-bzip2.patch
@@ -1,4 +1,4 @@
-From a81d1c7ec4be590e394231631a2ae89ca8d6da24 Mon Sep 17 00:00:00 2001
+From 462162f918d70db105d620fce75f3a4163dbf205 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
 Subject: [PATCH 12/24] Unvendor bzip2
@@ -86,5 +86,5 @@ index 7c0b5162537..c1f960608c3 100644
      </ClInclude>
    </ItemGroup>
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
index 1868adff..20a02949 100644
--- a/recipe/patches/0014-Unvendor-tcltk.patch
+++ b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,15 +1,15 @@
-From 8d3b4da5f463d6f5b4aa0f92a9c5f4ffe35be6f9 Mon Sep 17 00:00:00 2001
+From 0c88a8e5d9673742d74fb5b4be8ad45c33f1f43f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
 Subject: [PATCH 14/24] Unvendor tcltk
 
 ---
  PCbuild/_tkinter.vcxproj | 6 ------
- PCbuild/tcltk.props      | 6 +++---
- 2 files changed, 3 insertions(+), 9 deletions(-)
+ PCbuild/tcltk.props      | 7 +++----
+ 2 files changed, 3 insertions(+), 10 deletions(-)
 
 diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
-index de9358312ac..3fe2c29c823 100644
+index de93583..3fe2c29 100644
 --- a/PCbuild/_tkinter.vcxproj
 +++ b/PCbuild/_tkinter.vcxproj
 @@ -128,12 +128,6 @@
@@ -26,22 +26,20 @@ index de9358312ac..3fe2c29c823 100644
      <WriteLinesToFile File="$(OutDir)TCL_LIBRARY.env" Lines="$(tcltkdir)\lib\tcl$(TclMajorVersion).$(TclMinorVersion)" Encoding="utf-8" Overwrite="true" />
    </Target>
 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
-index d26b36ba98e..4780ff5e531 100644
+index 28e8c0d..cf2b2dc 100644
 --- a/PCbuild/tcltk.props
 +++ b/PCbuild/tcltk.props
-@@ -12,9 +12,9 @@
-     <TkMinorVersion>$([System.Version]::Parse($(TkVersion)).Minor)</TkMinorVersion>
+@@ -13,10 +13,9 @@
      <TkPatchLevel>$([System.Version]::Parse($(TkVersion)).Build)</TkPatchLevel>
      <TkRevision>$([System.Version]::Parse($(TkVersion)).Revision)</TkRevision>
--    <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir>
+     <!-- Back compat hack.  If you're here wondering about -core vs not, do us both a favor and just override the whole tclDir variable -->
+-    <tclDir Condition="$(tclDir) == '' and $(TclMajorVersion) == '8'">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir>
+-    <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-$(TclVersion)\</tclDir>
 -    <tkDir Condition="$(tkDir) == ''">$(ExternalsDir)tk-$(TkVersion)\</tkDir>
 -    <tcltkDir Condition="$(tcltkDir) == ''">$(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\</tcltkDir>
 +    <tclDir>$(condaDir)</tclDir>
 +    <tkDir>$(condaDir)</tkDir>
 +    <tcltkDir>$(condaDir)</tcltkDir>
-     <tclWin32Exe Condition="$(Platform) == 'Win32'">$(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe>
-     <tclWin32Exe Condition="$(Platform) != 'Win32'">$(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe>
-     <tclExternalTommath Condition="$(TclMajorVersion) == '9'">TCL_WITH_EXTERNAL_TOMMATH;</tclExternalTommath>
--- 
-2.50.1 (Apple Git-155)
-
+     <tcltkSuffix Condition="'$(TclMajorVersion)' == '8'">t</tcltkSuffix>
+     <tkPrefix Condition="'$(TclMajorVersion)' == '9'">tcl9</tkPrefix>
+     <TclshNativeFlag Condition="$(Platform) != 'Win32'">TCLSH_NATIVE="$(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)$(tcltkSuffix).exe"</TclshNativeFlag>
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
index f6a8395d..bfe27954 100644
--- a/recipe/patches/0015-unvendor-xz.patch
+++ b/recipe/patches/0015-unvendor-xz.patch
@@ -1,4 +1,4 @@
-From 0d87367978eb9f511608eeaa4fb0cda4ca3f6c80 Mon Sep 17 00:00:00 2001
+From 00a319e99bc9a8beaa1c585e3037885dc16cb58a Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
 Subject: [PATCH 15/24] unvendor xz
@@ -42,5 +42,5 @@ index 321f41d8d27..6811fd1709e 100644
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
index 2460a174..222fd8ef 100644
--- a/recipe/patches/0016-unvendor-zlib.patch
+++ b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,18 +1,18 @@
-From 34087fc34c8ec23a753abc13dac9de38a64f114c Mon Sep 17 00:00:00 2001
-From: Isuru Fernando <isuruf@gmail.com>
-Date: Wed, 29 Sep 2021 15:21:55 -0700
-Subject: [PATCH 16/24] unvendor zlib
-
----
- PCbuild/pythoncore.vcxproj         |  8 ++--
- PCbuild/pythoncore.vcxproj.filters | 66 ------------------------------
- 2 files changed, 4 insertions(+), 70 deletions(-)
-
-diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index 11c2bd350a8..4471986b104 100644
---- a/PCbuild/pythoncore.vcxproj
-+++ b/PCbuild/pythoncore.vcxproj
-@@ -82,7 +82,7 @@
+From bf303d3b27688d62fe6a55fe7e32ee6c54b8d670 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Wed, 29 Sep 2021 15:21:55 -0700
+Subject: [PATCH 16/24] unvendor zlib
+
+---
+ PCbuild/pythoncore.vcxproj         |  8 ++--
+ PCbuild/pythoncore.vcxproj.filters | 66 ------------------------------
+ 2 files changed, 4 insertions(+), 70 deletions(-)
+
+diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
+index b455b3089ca..00e29eae266 100644
+--- a/PCbuild/pythoncore.vcxproj
++++ b/PCbuild/pythoncore.vcxproj
+@@ -82,7 +82,7 @@
    <PropertyGroup>
      <KillPython>true</KillPython>
      <RequireProfileData>true</RequireProfileData>
@@ -21,7 +21,7 @@ index 11c2bd350a8..4471986b104 100644
      <IncludeExternals Condition="$(IncludeExternals) == ''">false</IncludeExternals>
    </PropertyGroup>
    <ImportGroup Label="PropertySheets">
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@
      <ClCompile>
        <AdditionalOptions>/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalIncludeDirectories>$(PySourcePath)Modules\_hacl;$(PySourcePath)Modules\_hacl\include;$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -30,22 +30,22 @@ index 11c2bd350a8..4471986b104 100644
        <AdditionalIncludeDirectories Condition="'$(UseJIT)' == 'true'">$(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@@ -112,8 +112,8 @@
-       <PreprocessorDefinitions Condition="'$(DisableRemoteDebug)' != 'true'">Py_REMOTE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -113,8 +113,8 @@
+       <PreprocessorDefinitions Condition="'$(StackRefDebug)' == 'true'">Py_STACKREF_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <AdditionalDependencies Condition="$(IncludeExternals)">zlib-ng$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <AdditionalLibraryDirectories>$(condaDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemGroup>
-diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
-index 0e6d42cc959..144a0e3425a 100644
---- a/PCbuild/pythoncore.vcxproj.filters
-+++ b/PCbuild/pythoncore.vcxproj.filters
-@@ -900,39 +900,6 @@
+       <AdditionalDependencies Condition="'$(UseJIT)' == 'true' and $(Platform) == 'ARM64'">$(GeneratedJitStencilsDir)jit_shim-aarch64-pc-windows-msvc.o;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalDependencies Condition="'$(UseJIT)' == 'true' and $(Platform) == 'Win32'">$(GeneratedJitStencilsDir)jit_shim-i686-pc-windows-msvc.o;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalDependencies Condition="'$(UseJIT)' == 'true' and $(Platform) == 'x64'">$(GeneratedJitStencilsDir)jit_shim-x86_64-pc-windows-msvc.o;%(AdditionalDependencies)</AdditionalDependencies>
+diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
+index 649ee1859ff..6fb1a6b5d0f 100644
+--- a/PCbuild/pythoncore.vcxproj.filters
++++ b/PCbuild/pythoncore.vcxproj.filters
+@@ -939,39 +939,6 @@
      <ClInclude Include="..\Include\internal\mimalloc\mimalloc\types.h">
        <Filter>Include\internal\mimalloc</Filter>
      </ClInclude>
@@ -85,7 +85,7 @@ index 0e6d42cc959..144a0e3425a 100644
      <ClInclude Include="..\Include\internal\pycore_structseq.h">
        <Filter>Include\internal</Filter>
      </ClInclude>
-@@ -1580,39 +1547,6 @@
+@@ -1643,39 +1610,6 @@
      <ClCompile Include="..\Objects\odictobject.c">
        <Filter>Objects</Filter>
      </ClCompile>
@@ -126,5 +126,5 @@ index 0e6d42cc959..144a0e3425a 100644
        <Filter>Python</Filter>
      </ClCompile>
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
index 12e60cd1..00ff055a 100644
--- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
@@ -1,4 +1,4 @@
-From 6082d63f085f4680e030064edebaf7961748d193 Mon Sep 17 00:00:00 2001
+From cf5576446283f275f93e253e7fb591aed3707189 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:45:28 +0100
 Subject: [PATCH 17/24] Do not pass -g to GCC when not Py_DEBUG
@@ -10,10 +10,10 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 63aba6d8004..6c1442c2ec9 100755
+index 663ac7a6492..8ce2ebda6da 100755
 --- a/configure
 +++ b/configure
-@@ -5791,9 +5791,9 @@ if test $ac_test_CFLAGS; then
+@@ -5842,9 +5842,9 @@ if test $ac_test_CFLAGS; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -25,7 +25,7 @@ index 63aba6d8004..6c1442c2ec9 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -9569,7 +9569,7 @@ then
+@@ -9755,7 +9755,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -35,10 +35,10 @@ index 63aba6d8004..6c1442c2ec9 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 5f6a0622f37..833dbb9ab37 100644
+index 3f18cd6ab3a..6e4abae8132 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2303,7 +2303,7 @@ then
+@@ -2373,7 +2373,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -48,5 +48,5 @@ index 5f6a0622f37..833dbb9ab37 100644
  	    ;;
  	*)
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch
index a29e84af..7a5d0733 100644
--- a/recipe/patches/0018-Unvendor-expat.patch
+++ b/recipe/patches/0018-Unvendor-expat.patch
@@ -1,4 +1,4 @@
-From 0d33ad70420716d95eff93837a6d64744b5a0035 Mon Sep 17 00:00:00 2001
+From 77a6a33ce873eadbd540b1aa16b5b7fa8d0f1bd0 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Mar 2023 23:07:10 -0500
 Subject: [PATCH 18/24] Unvendor expat
@@ -123,7 +123,7 @@ index a5368024cce..88a13faa683 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
-index 3bcef600a3e..ec5d4b64b3c 100644
+index 7a1d5942a6c..8bc1bcec7e8 100644
 --- a/PCbuild/pyexpat.vcxproj
 +++ b/PCbuild/pyexpat.vcxproj
 @@ -90,23 +90,19 @@
@@ -132,7 +132,7 @@ index 3bcef600a3e..ec5d4b64b3c 100644
      <ClCompile>
 -      <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>$(condaDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
        <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -187,5 +187,5 @@ index fd22fc8c477..b8280b4049c 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
index 796641d9..a6c57c7e 100644
--- a/recipe/patches/0019-Remove-unused-readelf.patch
+++ b/recipe/patches/0019-Remove-unused-readelf.patch
@@ -1,4 +1,4 @@
-From 1cfc9dbb8f45be390523550a44a4d74e8a0cb0ff Mon Sep 17 00:00:00 2001
+From 1460dc7fd5e7a85d29f86839284d47599cfb9265 Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Thu, 25 May 2023 17:56:53 -0400
 Subject: [PATCH 19/24] Remove unused readelf
@@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``.
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index ba039794c88..7b0d6dced64 100644
+index e411160d3ba..a0c062146c8 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,7 +38,6 @@ CC=		@CC@
@@ -27,5 +27,5 @@ index ba039794c88..7b0d6dced64 100644
  ABIFLAGS=	@ABIFLAGS@
  ABI_THREAD=	@ABI_THREAD@
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
index 4495bcb9..5228dc08 100644
--- a/recipe/patches/0021-Override-configure-LIBFFI.patch
+++ b/recipe/patches/0021-Override-configure-LIBFFI.patch
@@ -1,4 +1,4 @@
-From 19ebe8a84f6e6c94b4d4310b995c0b35e21a1fda Mon Sep 17 00:00:00 2001
+From 176436b01861649d8b02a47e24e557c77c217a1a Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 5 Sep 2023 21:51:31 +0200
 Subject: [PATCH 20/24] Override configure LIBFFI
@@ -8,10 +8,10 @@ Subject: [PATCH 20/24] Override configure LIBFFI
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 6c1442c2ec9..c36afd583db 100755
+index 8ce2ebda6da..798a1e69141 100755
 --- a/configure
 +++ b/configure
-@@ -15248,7 +15248,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
+@@ -15904,7 +15904,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
  then :
  
                  have_libffi=yes
@@ -21,5 +21,5 @@ index 6c1442c2ec9..c36afd583db 100755
  
  fi
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch
index 13b72c25..49ee9852 100644
--- a/recipe/patches/0022-Unvendor-libmpdec.patch
+++ b/recipe/patches/0022-Unvendor-libmpdec.patch
@@ -1,17 +1,17 @@
-From daee1afe1630439904567d756fc6afb4de8ea4c4 Mon Sep 17 00:00:00 2001
-From: Isuru Fernando <isuruf@gmail.com>
-Date: Fri, 16 Aug 2024 21:34:43 -0500
-Subject: [PATCH 21/24] Unvendor libmpdec
-
----
- PCbuild/_decimal.vcxproj | 50 +++++-----------------------------------
- 1 file changed, 6 insertions(+), 44 deletions(-)
-
-diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
-index e9d60b4db1a..0f49d7923f5 100644
---- a/PCbuild/_decimal.vcxproj
-+++ b/PCbuild/_decimal.vcxproj
-@@ -93,65 +93,27 @@
+From a93336b239983227c6549ec1ede266b769f8a999 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Fri, 16 Aug 2024 21:34:43 -0500
+Subject: [PATCH 21/24] Unvendor libmpdec
+
+---
+ PCbuild/_decimal.vcxproj | 51 ++++++----------------------------------
+ 1 file changed, 6 insertions(+), 46 deletions(-)
+
+diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
+index 921d22e47b3..0f49d7923f5 100644
+--- a/PCbuild/_decimal.vcxproj
++++ b/PCbuild/_decimal.vcxproj
+@@ -93,64 +93,24 @@
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>
@@ -40,7 +40,6 @@ index e9d60b4db1a..0f49d7923f5 100644
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\convolute.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\crt.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\difradix2.h" />
-     <ClInclude Include="..\Modules\_decimal\docstrings.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\fnt.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\fourstep.h" />
 -    <ClInclude Include="..\Modules\_decimal\windows\mpdecimal.h" />
@@ -54,8 +53,8 @@ index e9d60b4db1a..0f49d7923f5 100644
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\typearith.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\umodarith.h" />
 -    <ClInclude Include="$(mpdecimalDir)\libmpdec\vccompat.h" />
-   </ItemGroup>
-   <ItemGroup>
+-  </ItemGroup>
+-  <ItemGroup>
      <ClCompile Include="..\Modules\_decimal\_decimal.c" />
 -    <ClCompile Include="$(mpdecimalDir)\libmpdec\basearith.c" />
 -    <ClCompile Include="$(mpdecimalDir)\libmpdec\constants.c" />
@@ -84,5 +83,4 @@ index e9d60b4db1a..0f49d7923f5 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
 -- 
-2.50.1 (Apple Git-155)
-
+2.51.0
diff --git a/recipe/patches/0023-branding.patch b/recipe/patches/0023-branding.patch
index 3f910d36..56dc81d6 100644
--- a/recipe/patches/0023-branding.patch
+++ b/recipe/patches/0023-branding.patch
@@ -1,4 +1,4 @@
-From 0eebd158398783bc754a17de1585648bea86f6b1 Mon Sep 17 00:00:00 2001
+From 4513e4447567bbd85ecba7c09e1951b7bb79824a Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Wed, 14 Jun 2023 22:52:16 -0400
 Subject: [PATCH 22/24] branding
@@ -9,10 +9,10 @@ Subject: [PATCH 22/24] branding
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 784b6b749b7..b24c0acf5fd 100644
+index 36489d4fdd9..56c79ffe547 100644
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -1208,7 +1208,7 @@ def _sys_version(sys_version=None):
+@@ -1139,7 +1139,7 @@ def _sys_version(sys_version=None):
      else:
          # CPython
          cpython_sys_version_parser = re.compile(
@@ -47,5 +47,5 @@ index 8d8bc6ea700..eee07cd5c82 100644
      PyOS_snprintf(version, sizeof(version), buildinfo_format,
                    PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler());
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0024-Unvendor-zlib-ng.patch b/recipe/patches/0024-Unvendor-zlib-ng.patch
index 538eca4c..d82852e6 100644
--- a/recipe/patches/0024-Unvendor-zlib-ng.patch
+++ b/recipe/patches/0024-Unvendor-zlib-ng.patch
@@ -1,16 +1,16 @@
-From 19e6cbb71ce911498ab4dd6c235195562314bcef Mon Sep 17 00:00:00 2001
+From bd0276b98bafd18a8e6b29ef336136ea8691178d Mon Sep 17 00:00:00 2001
 From: Ian Fitchet <ifitchet@anaconda.com>
 Date: Mon, 30 Jun 2025 11:20:05 +0100
 Subject: [PATCH 23/24] Unvendor zlib-ng
 
 ---
  PCbuild/pcbuild.proj            |   2 +-
- PCbuild/zlib-ng.vcxproj         | 122 +----------------
+ PCbuild/zlib-ng.vcxproj         | 124 +----------------
  PCbuild/zlib-ng.vcxproj.filters | 228 --------------------------------
- 3 files changed, 2 insertions(+), 350 deletions(-)
+ 3 files changed, 2 insertions(+), 352 deletions(-)
 
 diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
-index 7a5327bf016..cde688ef534 100644
+index 9d077bbd3f0..bed07aefa7f 100644
 --- a/PCbuild/pcbuild.proj
 +++ b/PCbuild/pcbuild.proj
 @@ -48,7 +48,7 @@
@@ -23,7 +23,7 @@ index 7a5327bf016..cde688ef534 100644
      <!--
      Parallel build is explicitly disabled for this project because it
 diff --git a/PCbuild/zlib-ng.vcxproj b/PCbuild/zlib-ng.vcxproj
-index de1698ae718..e3c9b16f6ef 100644
+index ffe8e70f2db..e3c9b16f6ef 100644
 --- a/PCbuild/zlib-ng.vcxproj
 +++ b/PCbuild/zlib-ng.vcxproj
 @@ -73,9 +73,6 @@
@@ -45,7 +45,7 @@ index de1698ae718..e3c9b16f6ef 100644
        <PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;</PreprocessorDefinitions>
        <PreprocessorDefinitions Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">%(PreprocessorDefinitions);X86_FEATURES;X86_HAVE_XSAVE_INTRIN;X86_SSE2;X86_SSSE3;X86_SSE42;X86_PCLMULQDQ_CRC;X86_AVX2;X86_AVX512;X86_AVX512VNNI;X86_VPCLMULQDQ_CRC</PreprocessorDefinitions>
        <PreprocessorDefinitions Condition="$(Configuration) == 'Debug'">%(PreprocessorDefinitions);ZLIB_DEBUG</PreprocessorDefinitions>
-@@ -102,132 +99,15 @@
+@@ -102,134 +99,15 @@
      </ClCompile>
    </ItemDefinitionGroup>
    <ItemGroup>
@@ -166,13 +166,15 @@ index de1698ae718..e3c9b16f6ef 100644
 -    <PropertyGroup>
 -      <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
 -    </PropertyGroup>
--    <WriteLinesToFile File="$(IntDir)zlib.h" Lines="$(Text)" />
+-    <MakeDir Directories="$(GeneratedZlibNgDir)" />
+-    <WriteLinesToFile File="$(GeneratedZlibNgDir)zlib.h" Lines="$(Text)" />
 -  </Target>
 -  <Target Name="_EnsureZlibNgH" Inputs="$(zlibNgDir)\zlib-ng.h.in" Outputs="$(IntDir)zlib-ng.h">
 -    <PropertyGroup>
 -      <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib-ng.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
 -    </PropertyGroup>
--    <WriteLinesToFile File="$(IntDir)zlib-ng.h" Lines="$(Text)" />
+-    <MakeDir Directories="$(GeneratedZlibNgDir)" />
+-    <WriteLinesToFile File="$(GeneratedZlibNgDir)zlib-ng.h" Lines="$(Text)" />
 -  </Target>
 -
 -  <Target Name="_EnsureZlibNgHeaders" BeforeTargets="PrepareForBuild"
@@ -426,5 +428,5 @@ index addbd45f880..0280369b001 100644
    <ItemGroup>
      <Filter Include="Source Files">
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch
index cc17ae56..a2aa853c 100644
--- a/recipe/patches/0025-Unvendor-zstd.patch
+++ b/recipe/patches/0025-Unvendor-zstd.patch
@@ -1,4 +1,4 @@
-From 8e33d5a82f85137935f6004c2c7be262c1c12c9b Mon Sep 17 00:00:00 2001
+From 1b16651e1f6b1f2674deb95c22379355ec779cac Mon Sep 17 00:00:00 2001
 From: Ian Fitchet <ifitchet@anaconda.com>
 Date: Mon, 30 Jun 2025 11:42:39 +0100
 Subject: [PATCH 24/24] Unvendor zstd
@@ -268,5 +268,5 @@ index eec666e5eaf..a2aa391f393 100644
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
 -- 
-2.50.1 (Apple Git-155)
+2.51.0
 
diff --git a/recipe/run_test_py315.py b/recipe/run_test_py315.py
new file mode 100644
index 00000000..519d275a
--- /dev/null
+++ b/recipe/run_test_py315.py
@@ -0,0 +1,270 @@
+# Design contract:
+#   - HARD checks (interpreter identity, core stdlib, ABI/build sanity) -> failure
+#     fails the conda-build test phase (non-zero exit).
+#   - SOFT checks (new PEP features) -> reported as PASS/SKIP, never fail the build,
+#     UNLESS the env var RUN_TEST_STRICT=1 is set (promote SOFT failures to HARD).
+#     Rationale: 3.15 is in beta; PEP APIs may shift until RC1 (2026-08-04).
+#
+# Tighten the SOFT probes into HARD asserts once building against v3.15.0rc1+.
+
+from __future__ import annotations
+
+import importlib.util
+import os
+import platform
+import sys
+import sysconfig
+from dataclasses import dataclass
+
+STRICT = os.environ.get("RUN_TEST_STRICT", "0") == "1"
+
+# The PEP feature probes only make sense on 3.15. On any other Python version
+# (e.g. a shared recipe built across a py matrix) they are skipped entirely.
+TARGET_VERSION = (3, 15)
+IS_TARGET = sys.version_info[:2] == TARGET_VERSION
+# For the dedicated python-3.15 feedstock, set RUN_TEST_REQUIRE_315=1 so a
+# non-3.15 interpreter is a HARD failure instead of a skip (catches a bad matrix).
+REQUIRE_TARGET = os.environ.get("RUN_TEST_REQUIRE_315", "0") == "1"
+
+PASS, SKIP, FAIL = "PASS", "SKIP", "FAIL"
+
+
+@dataclass
+class Result:
+    name: str
+    status: str
+    detail: str = ""
+    hard: bool = False  # if True, a FAIL aborts the test phase
+
+
+_results: list[Result] = []
+
+
+def record(name: str, status: str, detail: str = "", *, hard: bool = False) -> None:
+    _results.append(Result(name, status, detail, hard))
+
+
+def _spec_exists(modname: str) -> bool:
+    try:
+        return importlib.util.find_spec(modname) is not None
+    except (ImportError, ValueError):
+        return False
+
+
+def _compiles(src: str) -> bool:
+    # Probe a syntax-level PEP without executing it.
+    try:
+        compile(src, "<feature-probe>", "exec")
+        return True
+    except SyntaxError:
+        return False
+
+
+# --------------------------------------------------------------------------- #
+# HARD checks: must hold for any correct 3.15 build
+# --------------------------------------------------------------------------- #
+
+def check_interpreter_identity() -> None:
+    ver = (f"{platform.python_version()} "
+           f"({sys.version_info.releaselevel} {sys.version_info.serial})")
+    if IS_TARGET:
+        record("interpreter 3.15", PASS, ver, hard=True)
+    elif REQUIRE_TARGET:
+        record("interpreter 3.15", FAIL,
+               f"expected 3.15, got {sys.version_info[0]}.{sys.version_info[1]}",
+               hard=True)
+    else:
+        # Not the target version: sanity still runs, feature probes are skipped.
+        record("interpreter 3.15", SKIP, f"not target ({ver}) -> probes skipped")
+
+
+def check_core_stdlib() -> None:
+    # C-extension stdlib modules are the usual silent-failure surface: a build
+    # that lacks system libs (ssl/lzma/sqlite/...) imports the pure parts fine
+    # but breaks at runtime. Importing them here turns that into a build failure.
+    required = ["ssl", "ctypes", "sqlite3", "lzma", "bz2", "zlib",
+               "hashlib", "decimal", "readline", "curses"]
+    missing = []
+    for mod in required:
+        # readline/curses are absent on Windows by design.
+        if os.name == "nt" and mod in {"readline", "curses"}:
+            continue
+        try:
+            __import__(mod)
+        except ImportError as exc:
+            missing.append(f"{mod} ({exc})")
+    if missing:
+        record("core C-extension stdlib", FAIL, "; ".join(missing), hard=True)
+    else:
+        record("core C-extension stdlib", PASS, "all importable", hard=True)
+
+
+def check_build_sanity() -> None:
+    # Cross-check the build prefix matches the test env's interpreter.
+    prefix_ok = sys.prefix and os.path.isdir(sys.prefix)
+    abiflags = getattr(sys, "abiflags", "")
+    record(
+        "build sanity",
+        PASS if prefix_ok else FAIL,
+        f"prefix={sys.prefix} abiflags='{abiflags}'",
+        hard=True,
+    )
+
+
+# --------------------------------------------------------------------------- #
+# SOFT probes: 3.15 new features (API spellings may change before RC1)
+# --------------------------------------------------------------------------- #
+
+def probe_pep686_utf8_default() -> None:
+    # PEP 686: UTF-8 mode default. sys.flags.utf8_mode should be 1.
+    mode = getattr(sys.flags, "utf8_mode", None)
+    if mode == 1:
+        record("PEP 686 UTF-8 default", PASS, "sys.flags.utf8_mode=1")
+    else:
+        record("PEP 686 UTF-8 default", SKIP, f"utf8_mode={mode}")
+
+
+def probe_pep810_lazy_imports() -> None:
+    # PEP 810: explicit `lazy import` statement syntax.
+    record("PEP 810 lazy imports",
+           PASS if _compiles("lazy import os\n") else SKIP,
+           "compile('lazy import os')")
+
+
+def probe_pep798_unpack_comprehension() -> None:
+    # PEP 798: unpacking in comprehensions, e.g. [*xs for xs in groups].
+    src = "result = [*xs for xs in [[1, 2], [3]]]"
+    if _compiles(src):
+        ns: dict = {}
+        try:
+            exec(src, ns)
+            ok = ns.get("result") == [1, 2, 3]
+            record("PEP 798 unpack-in-comprehension",
+                   PASS if ok else FAIL, f"result={ns.get('result')}")
+        except Exception as exc:  # noqa: BLE001 - feature probe
+            record("PEP 798 unpack-in-comprehension", FAIL, repr(exc))
+    else:
+        record("PEP 798 unpack-in-comprehension", SKIP, "syntax not accepted")
+
+
+def probe_pep814_frozendict() -> None:
+    # PEP 814: frozendict built-in.
+    fd = getattr(__builtins__, "frozendict", None) if not isinstance(
+        __builtins__, dict) else __builtins__.get("frozendict")
+    record("PEP 814 frozendict",
+           PASS if fd is not None else SKIP,
+           "builtin present" if fd is not None else "builtin absent")
+
+
+def probe_pep661_sentinel() -> None:
+    # PEP 661: sentinel built-in type. Spelling unconfirmed at b3 — probe builtin
+    # name first, then a possible 'sentinels' module fallback.
+    builtin = (__builtins__.get("sentinel") if isinstance(__builtins__, dict)
+               else getattr(__builtins__, "sentinel", None))
+    if builtin is not None:
+        record("PEP 661 sentinel", PASS, "builtin present")
+    elif _spec_exists("sentinels"):
+        record("PEP 661 sentinel", PASS, "module 'sentinels' present")
+    else:
+        record("PEP 661 sentinel", SKIP, "not found (check final API)")
+
+
+def probe_pep799_profiling() -> None:
+    # PEP 799: dedicated 'profiling' package + Tachyon sampling profiler.
+    if _spec_exists("profiling"):
+        sub = next((s for s in ("profiling.sampling", "profiling.tachyon")
+                    if _spec_exists(s)), "")
+        record("PEP 799 profiling/Tachyon", PASS, sub or "package present")
+    else:
+        record("PEP 799 profiling/Tachyon", SKIP, "package absent")
+
+
+def probe_typing_features() -> None:
+    # PEP 747 TypeForm, PEP 728 TypedDict extra_items, PEP 800 disjoint bases.
+    import typing
+    record("PEP 747 TypeForm",
+           PASS if hasattr(typing, "TypeForm") else SKIP,
+           "typing.TypeForm")
+    # PEP 728: probe by constructing a TypedDict accepting extra_items kw.
+    try:
+        typing.TypedDict("X", {"a": int}, extra_items=int)  # type: ignore[call-arg]
+        record("PEP 728 TypedDict extra_items", PASS, "extra_items accepted")
+    except TypeError:
+        record("PEP 728 TypedDict extra_items", SKIP, "extra_items rejected")
+    record("PEP 800 disjoint bases",
+           PASS if hasattr(typing, "disjoint_base") else SKIP,
+           "typing.disjoint_base")
+
+
+def probe_build_variant_info() -> None:
+    # Informational: free-threading (PEP 703/793) and JIT state for this build.
+    gil_disabled = sysconfig.get_config_var("Py_GIL_DISABLED")
+    is_gil = getattr(sys, "_is_gil_enabled", lambda: None)()
+    record("free-threaded build (info)", SKIP,
+           f"Py_GIL_DISABLED={gil_disabled} gil_enabled={is_gil}")
+    jit = getattr(sys, "_jit", None)
+    if jit is not None:
+        avail = getattr(jit, "is_available", lambda: "?")()
+        active = getattr(jit, "is_active", lambda: "?")()
+        record("JIT (info)", SKIP, f"available={avail} active={active}")
+    else:
+        record("JIT (info)", SKIP, "sys._jit absent")
+
+
+def probe_cabi_notes() -> None:
+    # PEP 782 PyBytesWriter and PEP 803/820/793 free-threaded stable ABI are
+    # C-API surfaces; they cannot be exercised from a pure-Python test without
+    # compiling an extension. Recorded as N/A for visibility.
+    record("PEP 782 PyBytesWriter (C-API)", SKIP, "needs C ext to test")
+    record("PEP 803/820 free-threaded ABI (C-API)", SKIP, "needs C ext to test")
+
+
+# --------------------------------------------------------------------------- #
+
+def main() -> int:
+    # Universal sanity: runs on every Python version.
+    check_interpreter_identity()
+    check_core_stdlib()
+    check_build_sanity()
+
+    # 3.15-only: PEP feature probes are skipped on any other version.
+    if IS_TARGET:
+        probe_pep686_utf8_default()
+        probe_pep810_lazy_imports()
+        probe_pep798_unpack_comprehension()
+        probe_pep814_frozendict()
+        probe_pep661_sentinel()
+        probe_pep799_profiling()
+        probe_typing_features()
+        probe_build_variant_info()
+        probe_cabi_notes()
+    else:
+        record("3.15 feature probes", SKIP,
+               f"interpreter {sys.version_info[0]}.{sys.version_info[1]} "
+               "is not 3.15")
+
+    width = max(len(r.name) for r in _results)
+    print("\n=== Python 3.15 conda-build feature test ===")
+    print(f"interpreter: {sys.executable}")
+    print(f"strict mode: {STRICT}\n")
+    for r in _results:
+        tag = "[HARD]" if r.hard else "[soft]"
+        print(f"{tag} {r.status:<4} {r.name.ljust(width)}  {r.detail}")
+
+    hard_failed = [r for r in _results if r.hard and r.status == FAIL]
+    soft_failed = [r for r in _results if not r.hard and r.status == FAIL]
+
+    print()
+    print(f"summary: {sum(r.status == PASS for r in _results)} pass / "
+          f"{sum(r.status == SKIP for r in _results)} skip / "
+          f"{sum(r.status == FAIL for r in _results)} fail")
+
+    if hard_failed:
+        return 1
+    if STRICT and soft_failed:
+        return 2
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())