Skip to content

Commit 69f9488

Browse files
committed
python v3.13.2
1 parent b02fcbb commit 69f9488

25 files changed

Lines changed: 56 additions & 54 deletions

recipe/meta.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{% set version = "3.13.1" %}
1+
{% set version = "3.13.2" %}
22
{% set dev = "" %}
33
{% set dev_ = "" %}
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
55
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
66
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
7-
{% set build_number = 5 %}
7+
{% set build_number = 0 %}
88

99
# this makes the linter happy
1010
{% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -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: 80c16badb94ffe235280d4d9a099b8bc
49+
md5: 4c2d9202ab4db02c9d0999b14655dfe5
5050
patches:
5151
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
5252
- patches/0002-Win32-Do-not-download-externals.patch
@@ -75,6 +75,8 @@ source:
7575
{% if 'conda-forge' in channel_targets %}
7676
- patches/0023-Brand-conda-forge.patch
7777
{% endif %}
78+
# not ready yet, see #770
79+
# - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
7880

7981
build:
8082
number: {{ build_number }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dac2f3b33cbb97245660be0269f2dd015b7b8d06 Mon Sep 17 00:00:00 2001
1+
From bd6a844b045e3da9fac3fdda6d262c44df935c93 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/24] Win32: Change FD_SETSIZE from 512 to 2048

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7158d078f72cd29ad01301f762c4b3aaaf3a2d51 Mon Sep 17 00:00:00 2001
1+
From b454c45bc3a10ee4dcacbcbaedac3d435571c75c 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/24] Win32: Do not download externals

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From df36d349debe414f5b9d7d0ba937f5faff3ac486 Mon Sep 17 00:00:00 2001
1+
From 48a20f6fc2bafa3fef743b2d75d46ea29a6c76b9 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/24] Fix find_library so that it looks in sys.prefix/lib

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6121895c5d1b342b37cc0873176d047347189cf7 Mon Sep 17 00:00:00 2001
1+
From d5ef808db5a8d89e36babc8bba27d9833f48879c 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/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS

recipe/patches/0005-Unvendor-openssl.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ab54f63b3341cfe20d64bb536c63e1fcf14e619b Mon Sep 17 00:00:00 2001
1+
From 6f69b0440cf3eccda2bed832bd985287248ff6b3 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/24] Unvendor openssl

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 57d675669a6ebb5fdc5d329332993b018f706108 Mon Sep 17 00:00:00 2001
1+
From e2e509bbbad24186a2810a64840fb31c4caafbff 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/24] 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 655f497ed88c7bb9288bbaba0a6da899c1de8df6 Mon Sep 17 00:00:00 2001
1+
From 2d93b3366d9e42cd62b70cbfdf89e64a1ea4e65e 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/24] Add CondaEcosystemModifyDllSearchPath()
@@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
3333
1 file changed, 96 insertions(+)
3434

3535
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
36-
index 1701a1cd217..e9dba44f800 100644
36+
index ba835ef4c84..9e35e0ff000 100644
3737
--- a/Python/pylifecycle.c
3838
+++ b/Python/pylifecycle.c
39-
@@ -60,6 +60,10 @@
39+
@@ -79,6 +79,10 @@
4040

4141
#ifdef MS_WINDOWS
4242
# undef BYTE
@@ -47,7 +47,7 @@ index 1701a1cd217..e9dba44f800 100644
4747
#endif
4848

4949
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
50-
@@ -106,6 +110,94 @@ __attribute__ ((section (".PyRuntime")))
50+
@@ -128,6 +132,94 @@ __attribute__ ((section (".PyRuntime")))
5151
= _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie);
5252
_Py_COMP_DIAG_POP
5353

@@ -142,7 +142,7 @@ index 1701a1cd217..e9dba44f800 100644
142142
static int runtime_initialized = 0;
143143

144144
PyStatus
145-
@@ -122,6 +214,10 @@ _PyRuntime_Initialize(void)
145+
@@ -144,6 +236,10 @@ _PyRuntime_Initialize(void)
146146
}
147147
runtime_initialized = 1;
148148

recipe/patches/0008-Doing-d1trimfile.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 69e659ffc9565bc3a81d01f66aa021fcfaa80e49 Mon Sep 17 00:00:00 2001
1+
From 01dd68be0e26dfbf1ec8532d94c97b6ca1b2c7f1 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/24] Doing d1trimfile
@@ -888,12 +888,12 @@ index 1193e032245..6855845d131 100644
888888
<ResourceCompile>
889889
<PreprocessorDefinitions>PY_ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
890890
diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj
891-
index 1b617182013..4eecc214aa5 100644
891+
index db7128272f0..b0f54192eae 100644
892892
--- a/PCbuild/venvwlauncher.vcxproj
893893
+++ b/PCbuild/venvwlauncher.vcxproj
894894
@@ -94,6 +94,10 @@
895895
<ClCompile>
896-
<PreprocessorDefinitions>EXENAME=L"$(PyExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
896+
<PreprocessorDefinitions>EXENAME=L"$(PyWExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
897897
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
898898
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
899899
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 12fa37b4a106af3e57d87f7cfda2e5cd1f41b502 Mon Sep 17 00:00:00 2001
1+
From 2efd1bb74bafb1d530913d6cc63d11ef48a38344 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/24] cross compile darwin
@@ -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 5958382276e..44264f0c812 100755
14+
index 8895177e326..fd93841d034 100755
1515
--- a/Lib/platform.py
1616
+++ b/Lib/platform.py
17-
@@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
17+
@@ -460,7 +460,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 5958382276e..44264f0c812 100755
2929
try:
3030
import plistlib
3131
diff --git a/configure b/configure
32-
index 7cdd386c387..a75a8f825fe 100755
32+
index 1cd1f690f7b..603108eb031 100755
3333
--- a/configure
3434
+++ b/configure
35-
@@ -4048,6 +4048,9 @@ then
35+
@@ -4052,6 +4052,9 @@ then
3636
*-*-linux*)
3737
ac_sys_system=Linux
3838
;;
@@ -42,7 +42,7 @@ index 7cdd386c387..a75a8f825fe 100755
4242
*-*-cygwin*)
4343
ac_sys_system=Cygwin
4444
;;
45-
@@ -4496,6 +4499,9 @@ if test "$cross_compiling" = yes; then
45+
@@ -4500,6 +4503,9 @@ if test "$cross_compiling" = yes; then
4646
_host_ident=$host_cpu
4747
esac
4848
;;
@@ -53,7 +53,7 @@ index 7cdd386c387..a75a8f825fe 100755
5353
_host_ident=
5454
;;
5555
diff --git a/configure.ac b/configure.ac
56-
index 24e28a1e2de..3772d105fb2 100644
56+
index 3fcb18922c5..fd3cba43283 100644
5757
--- a/configure.ac
5858
+++ b/configure.ac
5959
@@ -324,6 +324,9 @@ then

0 commit comments

Comments
 (0)