Skip to content

Commit 50cdcaa

Browse files
committed
python 3.15.0a2
1 parent c90e3cf commit 50cdcaa

29 files changed

Lines changed: 144 additions & 120 deletions

recipe/conda_build_config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ MACOSX_SDK_VERSION: # [osx and x86_64]
22
- 11.0 # [osx and x86_64]
33
# See https://docs.python.org/3.14/whatsnew/3.14.html#a-new-type-of-interpreter
44
c_compiler_version: # [osx]
5-
- 20.1 # [osx]
5+
- 21 # [osx]
66
cxx_compiler_version: # [osx]
7-
- 20.1 # [osx]
7+
- 21 # [osx]
88

99
# Override Python `zip_keys`
1010
python:
11-
- 3.14
11+
- 3.15
1212
numpy:
1313
- 1.16
1414
python_impl:

recipe/meta.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% set version = "3.14.2" %}
2-
{% set dev = "" %}
1+
{% set version = "3.15.0" %}
2+
{% set dev = "a2" %}
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: 19a31b2838db3b53f9f2db8782bf8773
49+
md5: 8a16a56591101a698e8d0779d41782f4
5050
patches:
5151
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
5252
- patches/0002-Win32-Do-not-download-externals.patch
@@ -80,6 +80,8 @@ source:
8080
{% if freethreading == "yes" %}
8181
- patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch
8282
{% endif %}
83+
# https://github.com/python/cpython/pull/142039
84+
- patches/0027-Expand-guard-for-types_world_is_stopped.patch
8385

8486
build:
8587
number: {{ build_number }}
@@ -159,10 +161,10 @@ outputs:
159161
- llvm-tools # [osx]
160162
- ld_impl_{{ target_platform }} # [linux]
161163
- binutils_impl_{{ target_platform }} # [linux]
162-
- clang-19 # [not win]
163-
- llvm-tools-19 # [not win]
164-
- clang 19.* # [win]
165-
- llvm-tools 19.* # [win]
164+
- clang-21 # [not win]
165+
- llvm-tools-21 # [not win]
166+
- clang 21.* # [win]
167+
- llvm-tools 21.* # [win]
166168
- bzip2 # [build_platform != target_platform]
167169
- libsqlite # [build_platform != target_platform]
168170
- liblzma-devel # [build_platform != target_platform]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From 3dff368f2f15764584cd9d90234ae7e8248e4e4d Mon Sep 17 00:00:00 2001
1+
From f0d0c464af24f7fbbc430abaa005eb298e18e5c8 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
4-
Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
4+
Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048
55

66
https://github.com/ContinuumIO/anaconda-issues/issues/1241
77
---
88
Modules/selectmodule.c | 2 +-
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
12-
index d234d504cb5..3856307c611 100644
12+
index 19fe509ec5e..02c9665afa7 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 15bfc5e613ae654bd685f65d975d79ce88d3853d Mon Sep 17 00:00:00 2001
1+
From 6a15ec3d4e45c28bff8510c81f571c6112b13497 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
4-
Subject: [PATCH 02/26] Win32: Do not download externals
4+
Subject: [PATCH 02/27] Win32: Do not download externals
55

66
---
77
PCbuild/build.bat | 2 +-

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 2e9e95c2e3aa8d212a302de52f19d129c5068d57 Mon Sep 17 00:00:00 2001
1+
From 299fc079ce68d641b415cb3d8843e029d7fc5b6c 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
4-
Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib
4+
Subject: [PATCH 03/27] Fix find_library so that it looks in sys.prefix/lib
55
first
66

77
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 12999f1ec012f5c3859aa23070a5d293b852afda Mon Sep 17 00:00:00 2001
1+
From 5bb72c8e81480293d90558a693e1be1550d512b6 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
4-
Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
4+
Subject: [PATCH 04/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
55
is not 0
66

77
Co-authored-by: Isuru Fernando<isuruf@gmail.com>
@@ -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 b89d7427e3f..21df0efac12 100644
26+
index ceb605a75c8..6d5b9c0d480 100644
2727
--- a/Modules/getpath.py
2828
+++ b/Modules/getpath.py
2929
@@ -52,6 +52,7 @@

recipe/patches/0005-Unvendor-openssl.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From f3da6c061da6528ac2aa9069418e2abec3e81bec Mon Sep 17 00:00:00 2001
1+
From 17fcde2d5bbbe8236afdd38526ad7b59a6868ab5 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
4-
Subject: [PATCH 05/26] Unvendor openssl
4+
Subject: [PATCH 05/27] Unvendor openssl
55

66
Co-authored-by: Isuru Fernando <isuruf@gmail.com>
77
---
@@ -90,24 +90,24 @@ 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 d4d9a54248d..94fb385c1fb 100644
93+
index 7840e2a1cfc..253aa66f477 100644
9494
--- a/PCbuild/python.props
9595
+++ b/PCbuild/python.props
96-
@@ -67,6 +67,7 @@
96+
@@ -68,6 +68,7 @@
9797
<!-- Directories of external projects. tcltk is handled in tcltk.props -->
9898
<PropertyGroup>
9999
<ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
100100
+ <condaDir>$(LIBRARY_PREFIX)\</condaDir>
101101
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
102102
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
103103
</PropertyGroup>
104-
@@ -74,20 +75,8 @@
104+
@@ -75,20 +76,8 @@
105105
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
106106

107107
<PropertyGroup>
108108
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.50.4.0\</sqlite3Dir>
109109
- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
110-
- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
110+
- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.8.1.1\</lzmaDir>
111111
- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
112112
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
113113
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>

recipe/patches/0006-Unvendor-sqlite3.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 73585456429c8ce96c088d3403afd7e430bdeb85 Mon Sep 17 00:00:00 2001
1+
From 5d333d7c6aaa395b4bccee40fec534aa7c19d7f5 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
4-
Subject: [PATCH 06/26] Unvendor sqlite3
4+
Subject: [PATCH 06/27] Unvendor sqlite3
55

66
---
77
PCbuild/_sqlite3.vcxproj | 11 +++++------

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 966dfbe7e1972661885959ec72d34d52af373698 Mon Sep 17 00:00:00 2001
1+
From 83958047fd8a64f8c049735d5d8594bd5673a696 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
4-
Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath()
4+
Subject: [PATCH 07/27] Add CondaEcosystemModifyDllSearchPath()
55

66
The python interpreter is modifed so that it works as if the python interpreter
77
was called with the following conda directories.
@@ -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 352787c6495..4fd4fcb0f6e 100644
36+
index 67368b5ce07..e08b2df1226 100644
3737
--- a/Python/pylifecycle.c
3838
+++ b/Python/pylifecycle.c
39-
@@ -80,6 +80,10 @@
39+
@@ -81,6 +81,10 @@
4040

4141
#ifdef MS_WINDOWS
4242
# undef BYTE
@@ -47,7 +47,7 @@ index 352787c6495..4fd4fcb0f6e 100644
4747
#endif
4848

4949
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
50-
@@ -114,6 +118,93 @@ GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
50+
@@ -115,6 +119,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 352787c6495..4fd4fcb0f6e 100644
141141

142142
static int runtime_initialized = 0;
143143

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

recipe/patches/0008-Doing-d1trimfile.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 17412eb7031d69a13c749f5d6a5f9cdef01c1188 Mon Sep 17 00:00:00 2001
1+
From 5c39a338040451810cc97adc1d0088e914cccd07 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
4-
Subject: [PATCH 08/26] Doing d1trimfile
4+
Subject: [PATCH 08/27] Doing d1trimfile
55

66
---
77
PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++
@@ -147,7 +147,7 @@ index f15b80852e3..e565441ca4c 100644
147147
<ClInclude Include="..\Modules\_ctypes\_ctypes_test.h" />
148148
<ClInclude Include="..\Modules\_ctypes\_ctypes_test_generated.c.h" />
149149
diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
150-
index ee7421484b5..e9d60b4db1a 100644
150+
index 3ba49370d58..921d22e47b3 100644
151151
--- a/PCbuild/_decimal.vcxproj
152152
+++ b/PCbuild/_decimal.vcxproj
153153
@@ -99,6 +99,10 @@
@@ -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 5ceddf759b8..6b113ad8c2e 100644
182+
index 605861ad3fd..4082f3f6d51 100644
183183
--- a/PCbuild/_freeze_module.vcxproj
184184
+++ b/PCbuild/_freeze_module.vcxproj
185185
@@ -93,6 +93,10 @@
@@ -429,7 +429,7 @@ index 4e721e8ce09..3fec7516ed5 100644
429429
\ No newline at end of file
430430
+</Project>
431431
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
432-
index a68f15d25aa..5c42f15c312 100644
432+
index 68707a54ff6..4e88650812f 100644
433433
--- a/PCbuild/_testcapi.vcxproj
434434
+++ b/PCbuild/_testcapi.vcxproj
435435
@@ -92,6 +92,26 @@
@@ -603,11 +603,11 @@ index 87f6005fffc..de9358312ac 100644
603603
<Link>
604604
<AdditionalDependencies>$(tcltkLib);%(AdditionalDependencies)</AdditionalDependencies>
605605
diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj
606-
index 97938692328..212fb5e1ebc 100644
606+
index 75d4e162346..d50534affa1 100644
607607
--- a/PCbuild/liblzma.vcxproj
608608
+++ b/PCbuild/liblzma.vcxproj
609609
@@ -95,6 +95,10 @@
610-
<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>
610+
<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>
611611
<DisableSpecificWarnings>4244;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
612612
<AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -Wno-deprecated-declarations</AdditionalOptions>
613613
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|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 b911c938563..8e45967a83c 100644
723+
index 359a47fbfc4..ee07e5cffa2 100644
724724
--- a/PCbuild/pythoncore.vcxproj
725725
+++ b/PCbuild/pythoncore.vcxproj
726726
@@ -99,7 +99,7 @@

0 commit comments

Comments
 (0)