Skip to content

Commit 0d3e6ce

Browse files
xhochyxhochy
committed
Python 3.15.0a7
1 parent b703e4d commit 0d3e6ce

27 files changed

Lines changed: 76 additions & 76 deletions

‎recipe/meta.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set version = "3.15.0" %}
2-
{% set dev = "a3" %}
2+
{% set dev = "a7" %}
33
{% set dev_ = "" %}
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
55
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -46,7 +46,7 @@ package:
4646
source:
4747
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
4848
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
49-
md5: d6ee7c74b9618520e88ec175f5539623
49+
md5: 76b680750285a243d63dec8374b70818
5050
patches:
5151
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
5252
- patches/0002-Win32-Do-not-download-externals.patch

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8c8d4d1ded1d513cffb4ae94e5bb7c8cef63ec1c Mon Sep 17 00:00:00 2001
1+
From ffb1951d87e6554c3e0ae00b6ab8a042e085779a Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Wed, 16 Aug 2017 11:53:55 +0100
44
Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
@@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
12-
index 19fe509ec5e..02c9665afa7 100644
12+
index 137bf2ca55b..70e2d178c54 100644
1313
--- a/Modules/selectmodule.c
1414
+++ b/Modules/selectmodule.c
1515
@@ -44,7 +44,7 @@

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9f50db5dbb5a150b2c7799b16b6afacbb5339aa8 Mon Sep 17 00:00:00 2001
1+
From 25b73c426a756ffea6425130b7e22b5ee544c8ff Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Thu, 7 Sep 2017 11:35:47 +0100
44
Subject: [PATCH 02/26] Win32: Do not download externals
@@ -8,10 +8,10 @@ Subject: [PATCH 02/26] Win32: Do not download externals
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
11-
index e4de9a80d76..22892c05dc7 100644
11+
index 8fb2f096c93..e69b3aef564 100644
1212
--- a/PCbuild/build.bat
1313
+++ b/PCbuild/build.bat
14-
@@ -109,7 +109,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
14+
@@ -112,7 +112,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
1515
if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts
1616
if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
1717

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7312b782873147be93df6dd501030d8c6fcff5f3 Mon Sep 17 00:00:00 2001
1+
From bd6431cd6b69c8111e1b3c72a89d5ace434c6265 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 5 Dec 2017 22:47:59 +0000
44
Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib
@@ -25,10 +25,10 @@ index 583c47daff3..ab9b01c87e2 100644
2525
yield os.path.join(executable_path, name[len('@executable_path/'):])
2626

2727
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
28-
index 378f12167c6..bf45580ab9f 100644
28+
index 3b21658433b..ecd2c6cbd9c 100644
2929
--- a/Lib/ctypes/util.py
3030
+++ b/Lib/ctypes/util.py
31-
@@ -129,7 +129,8 @@ def dllist():
31+
@@ -135,7 +135,8 @@ def dllist():
3232
elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
3333
from ctypes.macholib.dyld import dyld_find as _dyld_find
3434
def find_library(name):
@@ -38,7 +38,7 @@ index 378f12167c6..bf45580ab9f 100644
3838
'%s.dylib' % name,
3939
'%s.framework/%s' % (name, name)]
4040
for name in possible:
41-
@@ -430,10 +431,30 @@ def _findLib_ld(name):
41+
@@ -436,10 +437,30 @@ def _findLib_ld(name):
4242
pass # result will be None
4343
return result
4444

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d8e1bbacdc5456cf43d9dfc0c1231023d285afe9 Mon Sep 17 00:00:00 2001
1+
From e380a8cfc9757d26d85cfe1d0c965b7415fb73ac Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Sat, 27 Oct 2018 18:48:30 +0100
44
Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
@@ -23,7 +23,7 @@ index 1e75993480a..ff96c8e1990 100644
2323
!progname_to_dict(dict, "real_executable") ||
2424
!library_to_dict(dict, "library") ||
2525
diff --git a/Modules/getpath.py b/Modules/getpath.py
26-
index ceb605a75c8..6d5b9c0d480 100644
26+
index 4dceb5cdc8d..43a47ca77af 100644
2727
--- a/Modules/getpath.py
2828
+++ b/Modules/getpath.py
2929
@@ -52,6 +52,7 @@
@@ -34,9 +34,9 @@ index ceb605a75c8..6d5b9c0d480 100644
3434

3535
# ** Values calculated at runtime **
3636
# config -- [in/out] dict of the PyConfig structure
37-
@@ -704,7 +705,7 @@ def search_up(prefix, *landmarks, test=isfile):
38-
else:
39-
pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK))
37+
@@ -706,7 +707,7 @@ def search_up(prefix, *landmarks, test=isfile):
38+
stdlib_zip = joinpath(base_prefix, ZIP_LANDMARK)
39+
pythonpath.append(stdlib_zip)
4040

4141
- if os_name == 'nt' and use_environment and winreg:
4242
+ if os_name == 'nt' and use_environment and winreg and ENV_CONDA_PY_ALLOW_REG_PATHS and ENV_CONDA_PY_ALLOW_REG_PATHS != '0':

‎recipe/patches/0005-Unvendor-openssl.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From fe3fd0f75ef1e5fbac3aebe2ae615858850d4324 Mon Sep 17 00:00:00 2001
1+
From d441985a62cf37f233a6093a187e06497740069d Mon Sep 17 00:00:00 2001
22
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
33
Date: Sat, 24 Nov 2018 20:38:02 -0600
44
Subject: [PATCH 05/26] Unvendor openssl
@@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644
9090
<Target Name="CleanAll">
9191
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
9292
diff --git a/PCbuild/python.props b/PCbuild/python.props
93-
index 7840e2a1cfc..253aa66f477 100644
93+
index 3ad8d81dfc9..05c8c7cd83f 100644
9494
--- a/PCbuild/python.props
9595
+++ b/PCbuild/python.props
9696
@@ -68,6 +68,7 @@
@@ -112,8 +112,8 @@ index 7840e2a1cfc..253aa66f477 100644
112112
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
113113
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
114114
<mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
115-
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.18\</opensslDir>
116-
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.18\$(ArchName)\</opensslOutDir>
115+
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.5.5\</opensslDir>
116+
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.5.5\$(ArchName)\</opensslOutDir>
117117
- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
118118
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
119119
- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>

‎recipe/patches/0006-Unvendor-sqlite3.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 89126b92c8ac764ce9e8034789bf74b4ecf003b5 Mon Sep 17 00:00:00 2001
1+
From b9106812add3d50b2f441cf7d463725f60b9978c Mon Sep 17 00:00:00 2001
22
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
33
Date: Tue, 5 Oct 2021 12:42:06 -0700
44
Subject: [PATCH 06/26] Unvendor sqlite3

‎recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0d5341782ce10d959a1914b99581aee95c4b4176 Mon Sep 17 00:00:00 2001
1+
From 32d83eacf1dc0cb8db86f22cd310e376d5493350 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 24 Dec 2019 18:37:17 +0100
44
Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath()
@@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
3333
1 file changed, 95 insertions(+)
3434

3535
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
36-
index 2527dca71d7..a2d28a9be46 100644
36+
index 711e7bc89b7..89ad70f2105 100644
3737
--- a/Python/pylifecycle.c
3838
+++ b/Python/pylifecycle.c
39-
@@ -81,6 +81,10 @@
39+
@@ -85,6 +85,10 @@
4040

4141
#ifdef MS_WINDOWS
4242
# undef BYTE
@@ -47,7 +47,7 @@ index 2527dca71d7..a2d28a9be46 100644
4747
#endif
4848

4949
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
50-
@@ -115,6 +119,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
50+
@@ -119,6 +123,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
5151
= _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie);
5252
_Py_COMP_DIAG_POP
5353

@@ -141,7 +141,7 @@ index 2527dca71d7..a2d28a9be46 100644
141141

142142
static int runtime_initialized = 0;
143143

144-
@@ -132,6 +223,10 @@ _PyRuntime_Initialize(void)
144+
@@ -136,6 +227,10 @@ _PyRuntime_Initialize(void)
145145
}
146146
runtime_initialized = 1;
147147

‎recipe/patches/0008-Doing-d1trimfile.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2c64caf81d33ab9dea54bf06d183b877ddc32d47 Mon Sep 17 00:00:00 2001
1+
From 9a38ec4f30d8ec426af73ff082b696dd31d3dcbb Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 31 Dec 2019 21:47:47 +0100
44
Subject: [PATCH 08/26] Doing d1trimfile
@@ -179,7 +179,7 @@ index 3eb9c89bcb6..920656f2ee2 100644
179179
</ItemDefinitionGroup>
180180
<ItemGroup>
181181
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
182-
index 605861ad3fd..4082f3f6d51 100644
182+
index cb806459596..a85ba7ca53f 100644
183183
--- a/PCbuild/_freeze_module.vcxproj
184184
+++ b/PCbuild/_freeze_module.vcxproj
185185
@@ -93,6 +93,10 @@
@@ -535,7 +535,7 @@ index c35ac83c1c7..c9d7f5d22b7 100644
535535
<ClCompile Include="..\Modules\_testimportmultiple.c" />
536536
</ItemGroup>
537537
diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj
538-
index f7e050b7c74..58c3e10c0f0 100644
538+
index f3e423fa046..ac285717998 100644
539539
--- a/PCbuild/_testinternalcapi.vcxproj
540540
+++ b/PCbuild/_testinternalcapi.vcxproj
541541
@@ -92,6 +92,26 @@
@@ -618,13 +618,13 @@ index 75d4e162346..d50534affa1 100644
618618
</ItemDefinitionGroup>
619619
<ItemGroup>
620620
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
621-
index dc9161a8b29..3bcef600a3e 100644
621+
index 8e0f5f63112..7a1d5942a6c 100644
622622
--- a/PCbuild/pyexpat.vcxproj
623623
+++ b/PCbuild/pyexpat.vcxproj
624624
@@ -92,6 +92,10 @@
625625
<ClCompile>
626626
<AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
627-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
627+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
628628
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
629629
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
630630
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
@@ -720,7 +720,7 @@ index 3f8772d30b4..d80968e351a 100644
720720
<Link>
721721
<AdditionalDependencies>windowsapp.lib;%(AdditionalDependencies)</AdditionalDependencies>
722722
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
723-
index dcfb75ce162..5bf342227ad 100644
723+
index 61bee29c0af..d1efe476439 100644
724724
--- a/PCbuild/pythoncore.vcxproj
725725
+++ b/PCbuild/pythoncore.vcxproj
726726
@@ -99,7 +99,7 @@

‎recipe/patches/0009-cross-compile-darwin.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 42d193573c79b9760d36d9150d8308f136e874e9 Mon Sep 17 00:00:00 2001
1+
From 323229d393ca44056d519d8b926ac57d900f6fa9 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Fri, 2 Oct 2020 00:03:12 +0200
44
Subject: [PATCH 09/26] cross compile darwin
@@ -11,7 +11,7 @@ By Isuru Fernando.
1111
3 files changed, 18 insertions(+), 1 deletion(-)
1212

1313
diff --git a/Lib/platform.py b/Lib/platform.py
14-
index 3a71b669985..b342ceec761 100644
14+
index 9d7aa5c66a9..2401eff96df 100644
1515
--- a/Lib/platform.py
1616
+++ b/Lib/platform.py
1717
@@ -474,7 +474,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
@@ -29,10 +29,10 @@ index 3a71b669985..b342ceec761 100644
2929
try:
3030
import plistlib
3131
diff --git a/configure b/configure
32-
index a1bc7991aa8..f26e19a400a 100755
32+
index eca5f03cdcf..0595b8dc8c2 100755
3333
--- a/configure
3434
+++ b/configure
35-
@@ -4133,6 +4133,9 @@ then
35+
@@ -4140,6 +4140,9 @@ then
3636
*-*-linux*)
3737
ac_sys_system=Linux
3838
;;
@@ -42,7 +42,7 @@ index a1bc7991aa8..f26e19a400a 100755
4242
*-*-cygwin*)
4343
ac_sys_system=Cygwin
4444
;;
45-
@@ -4612,6 +4615,9 @@ if test "$cross_compiling" = yes; then
45+
@@ -4619,6 +4622,9 @@ if test "$cross_compiling" = yes; then
4646
_host_ident=$host_cpu
4747
esac
4848
;;
@@ -53,7 +53,7 @@ index a1bc7991aa8..f26e19a400a 100755
5353
_host_ident=
5454
;;
5555
diff --git a/configure.ac b/configure.ac
56-
index a284a118f02..b86228cea4f 100644
56+
index c21024a1e77..9a63e9bbaef 100644
5757
--- a/configure.ac
5858
+++ b/configure.ac
5959
@@ -333,6 +333,9 @@ then

0 commit comments

Comments
 (0)