python 3.13.15

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.13.14" %}
+{% set version = "3.13.15" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.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: 639e43243c620a308f968213df9e00f2f8f62332f7adbaa7a7eeb9783057c690
+    sha256: 1e66a7945a48390ee4c2a4268a0e4185884059a13c4aab6d148aa208deea4a76
 {% endif %}
     patches:
       - patches/0000-branding.patch

recipe/patches/0000-branding.patch

@@ -1,7 +1,7 @@
-From 3be7cda6e0b58051fcf761a694fd6065dc9d84a1 Mon Sep 17 00:00:00 2001
+From 7e2bf4f82f0b1301259acb23a9f467d42aab63de Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Wed, 14 Jun 2023 22:52:16 -0400
-Subject: [PATCH 01/22] branding
+Subject: [PATCH 00/22] branding
 
 ---
  Lib/platform.py     | 2 +-
@@ -46,3 +46,6 @@ index 226b2f999a6..0c7ff163257 100644
  #endif
      PyOS_snprintf(version, sizeof(version), buildinfo_format,
                    PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler());
+-- 
+2.51.0
+

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

@@ -1,15 +1,15 @@
-From 243e8bbee5535580bbd84dec07f7490ab1833a49 Mon Sep 17 00:00:00 2001
+From 4232d5634a4a27959efbc6af96ea36110b6469fc 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 02/22] 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 5bd9b7732a4..504f79e8998 100644
+index f69df694d44..1761960c928 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
 @@ -45,7 +45,7 @@
@@ -21,3 +21,6 @@ index 5bd9b7732a4..504f79e8998 100644
  #endif
 
  #if defined(HAVE_POLL_H)
+-- 
+2.51.0
+

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

@@ -1,7 +1,7 @@
-From b659c518f68ae106e1ac47cd2c0635359d393ec0 Mon Sep 17 00:00:00 2001
+From 3e51707f43e569918b3f5eac73e45813b25afb8c 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 03/22] Win32: Do not download externals
+Subject: [PATCH 02/22] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-
@@ -20,3 +20,6 @@ index 6c76f09a071..7c93d81b503 100644
 
  if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" (
      if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" (
+-- 
+2.51.0
+

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

@@ -1,7 +1,7 @@
-From 4924a4432345994ee345573bd6b26f1c18106a0c Mon Sep 17 00:00:00 2001
+From bb7a3a91990e8b2badcd7e5b5b6f15374dd51961 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 04/22] 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
 
 ---
@@ -25,7 +25,7 @@ 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 117bf06cb01..2e9fa474ace 100644
+index 43f10dedce8..33f914a0028 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
 @@ -70,7 +70,8 @@ def find_library(name):
@@ -38,7 +38,7 @@ index 117bf06cb01..2e9fa474ace 100644
                      '%s.dylib' % name,
                      '%s.framework/%s' % (name, name)]
          for name in possible:
-@@ -336,10 +337,30 @@ def _findLib_ld(name):
+@@ -335,10 +336,30 @@ def _findLib_ld(name):
                  pass  # result will be None
              return result
 
@@ -71,3 +71,6 @@ index 117bf06cb01..2e9fa474ace 100644
 
  ################################################################
  # test code
+-- 
+2.51.0
+

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

@@ -1,7 +1,7 @@
-From 27c50d3e1469817ec1cd8379118484f4689f427b Mon Sep 17 00:00:00 2001
+From 97b310738a30e0a821c9d43f4bf6bdfae914e5bb 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 05/22] 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<isuruf@gmail.com>
@@ -25,7 +25,7 @@ index d0128b20fae..e7cfeba25ec 100644
          !progname_to_dict(dict, "real_executable") ||
          !library_to_dict(dict, "library") ||
 diff --git a/Modules/getpath.py b/Modules/getpath.py
-index 1f1bfcb4f64..344900c05e7 100644
+index 8a4bf6d735e..37cfee3d2e7 100644
 --- a/Modules/getpath.py
 +++ b/Modules/getpath.py
 @@ -52,6 +52,7 @@
@@ -36,7 +36,7 @@ index 1f1bfcb4f64..344900c05e7 100644
 
  # ** Values calculated at runtime **
  # config            -- [in/out] dict of the PyConfig structure
-@@ -681,7 +682,7 @@ def search_up(prefix, *landmarks, test=isfile):
+@@ -674,7 +675,7 @@ def search_up(prefix, *landmarks, test=isfile):
      else:
          pythonpath.append(joinpath(prefix, ZIP_LANDMARK))
 
@@ -1196,3 +1196,6 @@ index 00000000000..a73ea8a0e91
 +    }
 +    return hPython3 != NULL;
 +}
+-- 
+2.51.0
+

recipe/patches/0005-Unvendor-openssl.patch

@@ -1,22 +1,22 @@
-From a5bc981e40a00c01ddd9c82015cc987358721c89 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    | 11 +----------
- PCbuild/python.vcxproj  |  3 +++
- PCbuild/pythonw.vcxproj |  3 +++
- 5 files changed, 9 insertions(+), 54 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 6f72185c07381690b0a69aa8c288d5c1dfc6497d 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/22] Unvendor openssl
+
+Co-authored-by: Isuru Fernando <isuruf@gmail.com>
+---
+ PCbuild/openssl.props   | 14 ++------------
+ PCbuild/openssl.vcxproj | 32 --------------------------------
+ PCbuild/python.props    | 11 +----------
+ PCbuild/python.vcxproj  |  3 +++
+ PCbuild/pythonw.vcxproj |  3 +++
+ 5 files changed, 9 insertions(+), 54 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,19 +89,19 @@ 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 62f42d0ce9c..0ec0914facd 100644
---- a/PCbuild/python.props
-+++ b/PCbuild/python.props
-@@ -61,6 +61,7 @@
+diff --git a/PCbuild/python.props b/PCbuild/python.props
+index 64e4cd08db7..d0d58ce57e4 100644
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -62,6 +62,7 @@
    <!-- Directories of external projects. tcltk is handled in tcltk.props -->
    <PropertyGroup>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
 +    <condaDir>$(LIBRARY_PREFIX)\</condaDir>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
    </PropertyGroup>
-@@ -68,18 +69,8 @@
+@@ -69,18 +70,8 @@
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
 
    <PropertyGroup>
@@ -120,11 +120,11 @@ index 62f42d0ce9c..0ec0914facd 100644
    </PropertyGroup>
 
    <PropertyGroup>
-diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
-index 4a99ffc677c..b11fb617963 100644
---- a/PCbuild/python.vcxproj
-+++ b/PCbuild/python.vcxproj
-@@ -110,6 +110,9 @@
+diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
+index 4a99ffc677c..b11fb617963 100644
+--- a/PCbuild/python.vcxproj
++++ b/PCbuild/python.vcxproj
+@@ -110,6 +110,9 @@
    </ItemGroup>
    <ItemGroup>
      <ClCompile Include="..\Programs\python.c" />
@@ -134,11 +134,11 @@ index 4a99ffc677c..b11fb617963 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
-diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index d08c210ef8a..87f71ca59d1 100644
---- a/PCbuild/pythonw.vcxproj
-+++ b/PCbuild/pythonw.vcxproj
-@@ -102,6 +102,9 @@
+diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
+index d08c210ef8a..87f71ca59d1 100644
+--- a/PCbuild/pythonw.vcxproj
++++ b/PCbuild/pythonw.vcxproj
+@@ -102,6 +102,9 @@
    </ItemGroup>
    <ItemGroup>
      <ClCompile Include="..\PC\WinMain.c" />
@@ -148,3 +148,6 @@ index d08c210ef8a..87f71ca59d1 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
+-- 
+2.51.0
+

recipe/patches/0006-Unvendor-sqlite3.patch

@@ -1,7 +1,7 @@
-From d11ed988e3607d8ed0fe6579cb74a3801b426582 Mon Sep 17 00:00:00 2001
+From a26f438ac80a24cecd65099fa2e55cdeb76cabd4 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 07/22] Unvendor sqlite3
+Subject: [PATCH 06/22] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------
@@ -78,3 +78,6 @@ index 6bcc4e913c8..9fe4bb740ab 100644
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>
+-- 
+2.51.0
+

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,7 +1,7 @@
-From 56771c46459a48ea9ef30c4233b7e0aa1918335a Mon Sep 17 00:00:00 2001
+From d84960ff67f0fd088f73ef6b4e76beca899df447 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 08/22] 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 <isuruf@gmail.com>
  1 file changed, 96 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index a8852a88f94..f1a919bad51 100644
+index fbbc38bc8e1..05e587d8ea5 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -74,6 +74,10 @@
@@ -153,3 +153,6 @@ index a8852a88f94..f1a919bad51 100644
      return _PyRuntimeState_Init(&_PyRuntime);
  }
 
+-- 
+2.51.0
+