Merge pull request #781 from h-vetinari/bump

python v3.13.3

Author: isuruf

.gitignore

@@ -1,10 +1,10 @@
-{% set version = "3.13.2" %}
+{% set version = "3.13.3" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
 {% set ver3nd = ''.join(version.split('.')[0:3]) %}
-{% set build_number = 1 %}
+{% set build_number = 0 %}
 
 # this makes the linter happy
 {% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -46,7 +46,7 @@ package:
 source:
   - 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: 4c2d9202ab4db02c9d0999b14655dfe5
+    md5: 8bb5f0b8c9d9d7b87d7d98510e8d58e5
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
       - patches/0002-Win32-Do-not-download-externals.patch

.scripts/run_docker_build.sh

@@ -1,4 +1,4 @@
-From bd6a844b045e3da9fac3fdda6d262c44df935c93 Mon Sep 17 00:00:00 2001
+From b2dc38f831aa57016c7197a902310119c72a1b73 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

README.md

@@ -1,4 +1,4 @@
-From b454c45bc3a10ee4dcacbcbaedac3d435571c75c Mon Sep 17 00:00:00 2001
+From 6b2be09a90969918df41b16e3f04c6d65c8d618b 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

build-locally.py

@@ -1,4 +1,4 @@
-From 48a20f6fc2bafa3fef743b2d75d46ea29a6c76b9 Mon Sep 17 00:00:00 2001
+From d949c804acdacbc1e47de8e5aedc6c2ab3cbed5e 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

recipe/meta.yaml

@@ -1,4 +1,4 @@
-From d5ef808db5a8d89e36babc8bba27d9833f48879c Mon Sep 17 00:00:00 2001
+From f4e637fd1598a98625f5c969a92edc3aab0a0704 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

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

@@ -1,53 +1,17 @@
-From 6f69b0440cf3eccda2bed832bd985287248ff6b3 Mon Sep 17 00:00:00 2001
+From 0fe38386a63c0294fa0a25766554d3430ea909b4 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/_ssl.vcxproj         |  3 --
- PCbuild/_ssl.vcxproj.filters |  5 +---
- PCbuild/openssl.props        | 14 ++-------
- PCbuild/openssl.vcxproj      | 58 +-----------------------------------
- PCbuild/python.props         | 11 +------
- PCbuild/python.vcxproj       |  3 ++
- PCbuild/pythonw.vcxproj      |  5 +++-
- 7 files changed, 12 insertions(+), 87 deletions(-)
+ 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/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
-index d4e1affab03..ce21f992ff8 100644
---- a/PCbuild/_ssl.vcxproj
-+++ b/PCbuild/_ssl.vcxproj
-@@ -99,9 +99,6 @@
-   </ItemDefinitionGroup>
-   <ItemGroup>
-     <ClCompile Include="..\Modules\_ssl.c" />
--    <ClCompile Include="$(opensslIncludeDir)\applink.c">
--      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
--    </ClCompile>
-   </ItemGroup>
-   <ItemGroup>
-     <ResourceCompile Include="..\PC\python_nt.rc" />
-diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
-index 716a69a41af..7e8e5800a0d 100644
---- a/PCbuild/_ssl.vcxproj.filters
-+++ b/PCbuild/_ssl.vcxproj.filters
-@@ -12,13 +12,10 @@
-     <ClCompile Include="..\Modules\_ssl.c">
-       <Filter>Source Files</Filter>
-     </ClCompile>
--    <ClCompile Include="$(opensslIncludeDir)\applink.c">
--      <Filter>Source Files</Filter>
--    </ClCompile>
-   </ItemGroup>
-   <ItemGroup>
-     <ResourceCompile Include="..\PC\python_nt.rc">
-       <Filter>Resource Files</Filter>
-     </ResourceCompile>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
 diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
 index 5fd708b211e..044cefd95ea 100644
 --- a/PCbuild/openssl.props
@@ -81,10 +45,10 @@ index 5fd708b211e..044cefd95ea 100644
 -  </Target>
  </Project>
 diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
-index 0da6f674958..b79f35b2c7d 100644
+index 7ca750dda8f..17eee400ebb 100644
 --- a/PCbuild/openssl.vcxproj
 +++ b/PCbuild/openssl.vcxproj
-@@ -60,64 +60,8 @@
+@@ -60,40 +60,8 @@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <Import Project="pyproject.props" />
 
@@ -95,47 +59,23 @@ index 0da6f674958..b79f35b2c7d 100644
 -set VCINSTALLDIR=$(VCInstallDir)
 -if not exist "$(IntDir.TrimEnd('\'))" mkdir "$(IntDir.TrimEnd('\'))"
 -cd /D "$(IntDir.TrimEnd('\'))"
--$(Perl) "$(opensslDir)\configure" $(OpenSSLPlatform) no-asm
+-$(Perl) "$(opensslDir)\configure" $(OpenSSLPlatform) no-asm no-uplink
 -nmake
 -</NMakeBuildCommandLine>
 -  </PropertyGroup>
 -
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
--  <Target Name="_PatchUplink" BeforeTargets="Build">
--    <PropertyGroup>
--      <Uplink>$(opensslDir)\ms\uplink.c</Uplink>
--      <BeforePatch>((h = GetModuleHandle(NULL)) == NULL)</BeforePatch>
--      <AfterPatch>((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL /*patched*/)</AfterPatch>
--    </PropertyGroup>
--    <Error Text="Cannot find $(Uplink)" Condition="!Exists($(Uplink))" />
--    <PropertyGroup>
--      <_Original>$([System.IO.File]::ReadAllText($(Uplink)))</_Original>
--      <_Patched>$(_Original.Replace($(BeforePatch), $(AfterPatch)))</_Patched>
--      <IsPatched>false</IsPatched>
--      <IsPatched Condition="$(_Patched) == $(_Original)">true</IsPatched>
--    </PropertyGroup>
--    <Message Text="$(Uplink) is already patched" Importance="normal" Condition="$(IsPatched)" />
--    <Message Text="Patching $(Uplink)" Importance="high" Condition="!$(IsPatched)" />
--    <WriteLinesToFile File="$(Uplink)"
--                      Lines="$(_Patched)"
--                      Overwrite="true"
--                      Encoding="ASCII"
--                      Condition="!$(IsPatched)" />
--  </Target>
--
 -  <Target Name="_CopyToOutput" AfterTargets="Build">
 -    <ItemGroup>
 -      <_Built Include="$(opensslDir)\LICENSE" />
 -      <_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" />
 -      <_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" />
--      <_AppLink Include="$(opensslDir)\ms\applink.c" />
 -      <_Include Include="$(opensslDir)\Include\openssl\*.h" />
 -      <_Include Include="$(IntDir)\include\openssl\*.h" />
 -    </ItemGroup>
 -    <MakeDir Directories="$(opensslOutDir)\include\openssl" />
 -    <Copy SourceFiles="@(_Built)" DestinationFolder="$(opensslOutDir)" />
--    <Copy SourceFiles="@(_AppLink)" DestinationFolder="$(opensslOutDir)\include" />
 -    <Copy SourceFiles="@(_Include)" DestinationFolder="$(opensslOutDir)\include\openssl" />
 -  </Target>
 -
@@ -149,15 +89,8 @@ index 0da6f674958..b79f35b2c7d 100644
    <Target Name="Clean" />
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
-@@ -136,4 +80,4 @@ nmake
-   </Target>
-   
-   <Target Name="ResolveAssemblyReferences" />
--</Project>
-\ No newline at end of file
-+</Project>
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index c8ecdb4515a..0ec0914facd 100644
+index 42f11754218..0ec0914facd 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -61,6 +61,7 @@
@@ -172,15 +105,15 @@ index c8ecdb4515a..0ec0914facd 100644
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
 
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.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>
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
      <mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.15\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.15\$(ArchName)\</opensslOutDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.16\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.16.2\$(ArchName)\</opensslOutDir>
 -    <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
      <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 -    <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
@@ -202,7 +135,7 @@ index 4a99ffc677c..b11fb617963 100644
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index d08c210ef8a..58a9e852bed 100644
+index d08c210ef8a..87f71ca59d1 100644
 --- a/PCbuild/pythonw.vcxproj
 +++ b/PCbuild/pythonw.vcxproj
 @@ -102,6 +102,9 @@
@@ -215,10 +148,3 @@ index d08c210ef8a..58a9e852bed 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
-@@ -112,4 +115,4 @@
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-   <ImportGroup Label="ExtensionTargets">
-   </ImportGroup>
--</Project>
-\ No newline at end of file
-+</Project>