Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
libuuid:
- '2'
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_freethreadingno.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ freethreading:
- 'no'
libffi:
- '3.4'
liblzma_devel:
- '5'
openssl:
- '3'
pin_run_as_build:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_freethreadingyes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ freethreading:
- 'yes'
libffi:
- '3.4'
liblzma_devel:
- '5'
openssl:
- '3'
pin_run_as_build:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 19 additions & 9 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
MACOSX_SDK_VERSION: # [osx and x86_64]
- 11.0 # [osx and x86_64]

# Override Python `zip_keys`
python:
- 3.13
python_impl:
- cpython
numpy:
- 1.16
MACOSX_SDK_VERSION: # [osx and x86_64]
- 11.0 # [osx and x86_64]
python_impl:
- cpython
is_python_min:
- no

# Whether to build free-threaded Python (3.13+)
freethreading:
- yes
- no

# Use Python RC components in build
channel_sources:
- conda-forge/label/python_rc,conda-forge

# Configuration for debug and release builds
build_type:
- release
- debug # [not win]
channel_sources:
- conda-forge/label/python_rc,conda-forge
channel_targets:
- conda-forge main
- conda-forge python_debug # [not win]
freethreading:
- yes
- no
zip_keys:
- build_type
- channel_targets
8 changes: 5 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.13.1" %}
{% set version = "3.13.2" %}
{% 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 = 5 %}
{% set build_number = 0 %}

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

build:
number: {{ build_number }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dac2f3b33cbb97245660be0269f2dd015b7b8d06 Mon Sep 17 00:00:00 2001
From bd6a844b045e3da9fac3fdda6d262c44df935c93 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7158d078f72cd29ad01301f762c4b3aaaf3a2d51 Mon Sep 17 00:00:00 2001
From b454c45bc3a10ee4dcacbcbaedac3d435571c75c 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From df36d349debe414f5b9d7d0ba937f5faff3ac486 Mon Sep 17 00:00:00 2001
From 48a20f6fc2bafa3fef743b2d75d46ea29a6c76b9 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6121895c5d1b342b37cc0873176d047347189cf7 Mon Sep 17 00:00:00 2001
From d5ef808db5a8d89e36babc8bba27d9833f48879c 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
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0005-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ab54f63b3341cfe20d64bb536c63e1fcf14e619b Mon Sep 17 00:00:00 2001
From 6f69b0440cf3eccda2bed832bd985287248ff6b3 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
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0006-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 57d675669a6ebb5fdc5d329332993b018f706108 Mon Sep 17 00:00:00 2001
From e2e509bbbad24186a2810a64840fb31c4caafbff Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 5 Oct 2021 12:42:06 -0700
Subject: [PATCH 06/24] Unvendor sqlite3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 655f497ed88c7bb9288bbaba0a6da899c1de8df6 Mon Sep 17 00:00:00 2001
From 2d93b3366d9e42cd62b70cbfdf89e64a1ea4e65e Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 24 Dec 2019 18:37:17 +0100
Subject: [PATCH 07/24] Add CondaEcosystemModifyDllSearchPath()
Expand Down Expand Up @@ -33,10 +33,10 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
1 file changed, 96 insertions(+)

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

#ifdef MS_WINDOWS
# undef BYTE
Expand All @@ -47,7 +47,7 @@ index 1701a1cd217..e9dba44f800 100644
#endif

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

Expand Down Expand Up @@ -142,7 +142,7 @@ index 1701a1cd217..e9dba44f800 100644
static int runtime_initialized = 0;

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

Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0008-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 69e659ffc9565bc3a81d01f66aa021fcfaa80e49 Mon Sep 17 00:00:00 2001
From 01dd68be0e26dfbf1ec8532d94c97b6ca1b2c7f1 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 21:47:47 +0100
Subject: [PATCH 08/24] Doing d1trimfile
Expand Down Expand Up @@ -888,12 +888,12 @@ index 1193e032245..6855845d131 100644
<ResourceCompile>
<PreprocessorDefinitions>PY_ICON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj
index 1b617182013..4eecc214aa5 100644
index db7128272f0..b0f54192eae 100644
--- a/PCbuild/venvwlauncher.vcxproj
+++ b/PCbuild/venvwlauncher.vcxproj
@@ -94,6 +94,10 @@
<ClCompile>
<PreprocessorDefinitions>EXENAME=L"$(PyExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>EXENAME=L"$(PyWExeName)$(PyDebugExt).exe";_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/d1trimfile:%SRC_DIR%</AdditionalOptions>
Expand Down
Loading