Skip to content

Commit cacd389

Browse files
xhochyxhochy
committed
python 3.15.0a3
1 parent 5fd19e9 commit cacd389

28 files changed

Lines changed: 92 additions & 114 deletions

‎recipe/meta.yaml‎

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

8686
build:
8787
number: {{ build_number }}

‎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,7 +1,7 @@
1-
From f0d0c464af24f7fbbc430abaa005eb298e18e5c8 Mon Sep 17 00:00:00 2001
1+
From 8c8d4d1ded1d513cffb4ae94e5bb7c8cef63ec1c 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/27] Win32: Change FD_SETSIZE from 512 to 2048
4+
Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
55

66
https://github.com/ContinuumIO/anaconda-issues/issues/1241
77
---

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 6a15ec3d4e45c28bff8510c81f571c6112b13497 Mon Sep 17 00:00:00 2001
1+
From 9f50db5dbb5a150b2c7799b16b6afacbb5339aa8 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/27] Win32: Do not download externals
4+
Subject: [PATCH 02/26] Win32: Do not download externals
55

66
---
77
PCbuild/build.bat | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
11-
index 60235704886..edb61912b74 100644
11+
index e4de9a80d76..22892c05dc7 100644
1212
--- a/PCbuild/build.bat
1313
+++ b/PCbuild/build.bat
14-
@@ -107,7 +107,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
14+
@@ -109,7 +109,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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 299fc079ce68d641b415cb3d8843e029d7fc5b6c Mon Sep 17 00:00:00 2001
1+
From 7312b782873147be93df6dd501030d8c6fcff5f3 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/27] Fix find_library so that it looks in sys.prefix/lib
4+
Subject: [PATCH 03/26] 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 5bb72c8e81480293d90558a693e1be1550d512b6 Mon Sep 17 00:00:00 2001
1+
From d8e1bbacdc5456cf43d9dfc0c1231023d285afe9 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/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
4+
Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
55
is not 0
66

77
Co-authored-by: Isuru Fernando<isuruf@gmail.com>

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

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

66
Co-authored-by: Isuru Fernando <isuruf@gmail.com>
77
---

‎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 5d333d7c6aaa395b4bccee40fec534aa7c19d7f5 Mon Sep 17 00:00:00 2001
1+
From 89126b92c8ac764ce9e8034789bf74b4ecf003b5 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/27] Unvendor sqlite3
4+
Subject: [PATCH 06/26] Unvendor sqlite3
55

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 83958047fd8a64f8c049735d5d8594bd5673a696 Mon Sep 17 00:00:00 2001
1+
From 0d5341782ce10d959a1914b99581aee95c4b4176 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/27] Add CondaEcosystemModifyDllSearchPath()
4+
Subject: [PATCH 07/26] 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,7 +33,7 @@ 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 67368b5ce07..e08b2df1226 100644
36+
index 2527dca71d7..a2d28a9be46 100644
3737
--- a/Python/pylifecycle.c
3838
+++ b/Python/pylifecycle.c
3939
@@ -81,6 +81,10 @@

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

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

66
---
77
PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++
@@ -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 359a47fbfc4..ee07e5cffa2 100644
723+
index dcfb75ce162..5bf342227ad 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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 73649c07901551bcb28074e72c192e8338f2a794 Mon Sep 17 00:00:00 2001
1+
From 42d193573c79b9760d36d9150d8308f136e874e9 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
4-
Subject: [PATCH 09/27] cross compile darwin
4+
Subject: [PATCH 09/26] cross compile darwin
55

66
By Isuru Fernando.
77
---
@@ -11,10 +11,10 @@ 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 4db93bea2a3..fce802b20a2 100644
14+
index 3a71b669985..b342ceec761 100644
1515
--- a/Lib/platform.py
1616
+++ b/Lib/platform.py
17-
@@ -475,7 +475,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
17+
@@ -474,7 +474,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
1818
def _mac_ver_xml():
1919
fn = '/System/Library/CoreServices/SystemVersion.plist'
2020
if not os.path.exists(fn):
@@ -29,10 +29,10 @@ index 4db93bea2a3..fce802b20a2 100644
2929
try:
3030
import plistlib
3131
diff --git a/configure b/configure
32-
index a4514f80c3a..3896a8a6fce 100755
32+
index a1bc7991aa8..f26e19a400a 100755
3333
--- a/configure
3434
+++ b/configure
35-
@@ -4113,6 +4113,9 @@ then
35+
@@ -4133,6 +4133,9 @@ then
3636
*-*-linux*)
3737
ac_sys_system=Linux
3838
;;
@@ -42,7 +42,7 @@ index a4514f80c3a..3896a8a6fce 100755
4242
*-*-cygwin*)
4343
ac_sys_system=Cygwin
4444
;;
45-
@@ -4592,6 +4595,9 @@ if test "$cross_compiling" = yes; then
45+
@@ -4612,6 +4615,9 @@ if test "$cross_compiling" = yes; then
4646
_host_ident=$host_cpu
4747
esac
4848
;;
@@ -53,10 +53,10 @@ index a4514f80c3a..3896a8a6fce 100755
5353
_host_ident=
5454
;;
5555
diff --git a/configure.ac b/configure.ac
56-
index a059a07bec2..50381cf760e 100644
56+
index a284a118f02..b86228cea4f 100644
5757
--- a/configure.ac
5858
+++ b/configure.ac
59-
@@ -324,6 +324,9 @@ then
59+
@@ -333,6 +333,9 @@ then
6060
*-*-linux*)
6161
ac_sys_system=Linux
6262
;;
@@ -66,7 +66,7 @@ index a059a07bec2..50381cf760e 100644
6666
*-*-cygwin*)
6767
ac_sys_system=Cygwin
6868
;;
69-
@@ -771,6 +774,9 @@ if test "$cross_compiling" = yes; then
69+
@@ -780,6 +783,9 @@ if test "$cross_compiling" = yes; then
7070
_host_ident=$host_cpu
7171
esac
7272
;;

0 commit comments

Comments
 (0)