Skip to content
Open
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
16 changes: 16 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Agent guidance

## Updating Python and its patches

Before preparing a Python version bump or editing `recipe/patches/*.patch`, read
[the patch regeneration instructions](recipe/patches/README.md) and
[`make-mixed-crlf-patch.py`](recipe/patches/make-mixed-crlf-patch.py) on the target
version branch. If either is absent, consult the corresponding file on upstream
`main`. The repository's patch instructions are authoritative.

Follow the README's complete regeneration and validation workflow before
committing or publishing patch changes. Keep that workflow in the README rather
than duplicating it here.

Run the applicable recipe and pre-commit checks, and report any checks that could
not be completed.
6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.11.16" %}
{% set version = "3.11.17" %}
{% 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 = 2 %}
{% set build_number = 0 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -45,7 +45,7 @@ package:
source:
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
sha256: 91bcdebfdde239a003ae93738a7fce0f9230fee5c4bc2b86f6e6e8c6f98aabe8
sha256: bfb74ad39efae27cda510f134ab408e00f9992c56851cfc0b1cdb5646da11599
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8eb7c74e3d63c41284cd86f9d24b18921b163a5c Mon Sep 17 00:00:00 2001
From 10d69d27464be90c52536b2c284c393282086107 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/26] Win32: Change FD_SETSIZE from 512 to 2048
Expand All @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 82102698672..9af1ac8267d 100644
index 8210269867..9af1ac8267 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -38,7 +38,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From af5b00d49fc6265c34a632cf802679a5ab8b5ad0 Mon Sep 17 00:00:00 2001
From 594f0ecdc08661c1ade5bd68d5c7e5cff85075f3 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:59:00 +0100
Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
Expand All @@ -10,7 +10,7 @@ Really this is for mingw-w64 though
1 file changed, 3 insertions(+)

diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index 66c12dd3583..e6c790118bb 100644
index 66c12dd358..e6c790118b 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -80,6 +80,9 @@ def get_msvcr():
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 58efb8731689f5d8ce622dfd6b7692c2960f8e7a Mon Sep 17 00:00:00 2001
From 675bc27ae2e812f1b92ef1ee6d998e09e1ed77c7 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 21 Sep 2021 13:05:20 -0500
Subject: [PATCH 03/26] bpo-45258: search for -isysroot in addition to
Expand All @@ -10,7 +10,7 @@ Subject: [PATCH 03/26] bpo-45258: search for -isysroot in addition to
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ad8fb81b218..f7005862c2d 100644
index ad8fb81b21..f7005862c2 100644
--- a/setup.py
+++ b/setup.py
@@ -166,7 +166,7 @@ def sysroot_paths(make_vars, subdirs):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d649520549299bc33c21620365716bd7699a4c47 Mon Sep 17 00:00:00 2001
From 93a27e66a044043afc10bb45c143d93e3b483d64 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 5 Oct 2017 02:00:41 +0100
Subject: [PATCH 04/26] runtime_library_dir_option: Use 1st word of CC as
Expand All @@ -12,7 +12,7 @@ not get detected as gcc (or whatever it actually is).
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index d00c48981eb..54dd556fe5a 100644
index d00c48981e..54dd556fe5 100644
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -232,7 +232,8 @@ def runtime_library_dir_option(self, dir):
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-Win32-Do-not-download-externals.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9c33088d170fd21776f551f1ce8a301a2730ae4c Mon Sep 17 00:00:00 2001
From cd67ca0451daa6f23bd86eac32c0dc10f0dd75cb 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 05/26] Win32: Do not download externals
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 05/26] Win32: Do not download externals
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index d333ceabd2e..11e3d16a4fd 100644
index d333ceabd2..11e3d16a4f 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 235500939927a8f75fc2f0dab3436870065f5734 Mon Sep 17 00:00:00 2001
From 4f42ef67a7b170a0a339fb61ec9f9e9e666fe06c 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 06/26] Fix find_library so that it looks in sys.prefix/lib
Expand All @@ -10,7 +10,7 @@ Subject: [PATCH 06/26] Fix find_library so that it looks in sys.prefix/lib
2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
index 583c47daff3..ab9b01c87e2 100644
index 583c47daff..ab9b01c87e 100644
--- a/Lib/ctypes/macholib/dyld.py
+++ b/Lib/ctypes/macholib/dyld.py
@@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None):
Expand All @@ -25,7 +25,7 @@ index 583c47daff3..ab9b01c87e2 100644
yield os.path.join(executable_path, name[len('@executable_path/'):])

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index c550883e7c7..8f55134805f 100644
index c550883e7c..8f55134805 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -70,7 +70,8 @@ def find_library(name):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 260d5bfd0af51d3f2fe2c54fd17e33303b54bdb7 Mon Sep 17 00:00:00 2001
From 11da7c080952a40634b6252de2153da051465b0e Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 16 Sep 2021 15:46:09 -0500
Subject: [PATCH 07/26] bpo-22699: Allow compiling on debian/ubuntu with a
Expand All @@ -12,7 +12,7 @@ patch than given
1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f7005862c2d..feaeb1fcc4f 100644
index f7005862c2..feaeb1fcc4 100644
--- a/setup.py
+++ b/setup.py
@@ -688,9 +688,30 @@ def check_extension_import(self, ext):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 19604dc69f63146a47a07c30b11676c4973a39a1 Mon Sep 17 00:00:00 2001
From 27c2df0308789b4e234d6b68664c7df8ffa1cb72 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 08/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Expand All @@ -11,7 +11,7 @@ Co-authored-by: Isuru Fernando<isuruf@gmail.com>
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 61d654065fd..b80297c580c 100644
index 61d654065f..b80297c580 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -907,6 +907,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
Expand All @@ -23,7 +23,7 @@ index 61d654065fd..b80297c580c 100644
!progname_to_dict(dict, "real_executable") ||
!library_to_dict(dict, "library") ||
diff --git a/Modules/getpath.py b/Modules/getpath.py
index a7dd7342d4d..054862c05ce 100644
index a7dd7342d4..054862c05c 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -51,6 +51,7 @@
Expand Down
16 changes: 8 additions & 8 deletions recipe/patches/0009-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cfb0b7d01dd5f3d035a78ada6c4a05e218a834bc Mon Sep 17 00:00:00 2001
From 869c677168bef5dff2ae8f3636543462a83720cd 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 09/26] Unvendor openssl
Expand All @@ -15,7 +15,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
7 files changed, 10 insertions(+), 75 deletions(-)

diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
index 4907f49b662..b2c23d5e8cc 100644
index 4907f49b66..b2c23d5e8c 100644
--- a/PCbuild/_ssl.vcxproj
+++ b/PCbuild/_ssl.vcxproj
@@ -99,9 +99,6 @@
Expand All @@ -29,7 +29,7 @@ index 4907f49b662..b2c23d5e8cc 100644
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
index 716a69a41af..8aef9e03fcc 100644
index 716a69a41a..8aef9e03fc 100644
--- a/PCbuild/_ssl.vcxproj.filters
+++ b/PCbuild/_ssl.vcxproj.filters
@@ -12,9 +12,6 @@
Expand All @@ -43,7 +43,7 @@ index 716a69a41af..8aef9e03fcc 100644
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index a4186f01da2..044cefd95ea 100644
index a4186f01da..044cefd95e 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -2,10 +2,10 @@
Expand Down Expand Up @@ -77,7 +77,7 @@ index a4186f01da2..044cefd95ea 100644
\ No newline at end of file
+</Project>
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
index 0da6f674958..17eee400ebb 100644
index 0da6f67495..17eee400eb 100644
--- a/PCbuild/openssl.vcxproj
+++ b/PCbuild/openssl.vcxproj
@@ -60,64 +60,8 @@
Expand Down Expand Up @@ -146,7 +146,7 @@ index 0da6f674958..17eee400ebb 100644
<Target Name="CleanAll">
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 49347c2b78d..407203a86bf 100644
index 49347c2b78..407203a86b 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -61,6 +61,7 @@
Expand All @@ -158,7 +158,7 @@ index 49347c2b78d..407203a86bf 100644
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
</PropertyGroup>
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index f4640454a73..c1810c7db2b 100644
index f4640454a7..c1810c7db2 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -106,6 +106,9 @@
Expand All @@ -172,7 +172,7 @@ index f4640454a73..c1810c7db2b 100644
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index e23635e5ea9..525295c76ff 100644
index e23635e5ea..525295c76f 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -98,6 +98,9 @@
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0010-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d352b98ae39b333f8709d3a00002d7956360afd4 Mon Sep 17 00:00:00 2001
From 8722f2c49eda3860401fb23f886d32e8f1640776 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 10/26] Unvendor sqlite3
Expand All @@ -10,7 +10,7 @@ Subject: [PATCH 10/26] Unvendor sqlite3
3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
index 57c7413671e..4735477f00c 100644
index 57c7413671..4735477f00 100644
--- a/PCbuild/_sqlite3.vcxproj
+++ b/PCbuild/_sqlite3.vcxproj
@@ -93,9 +93,12 @@
Expand Down Expand Up @@ -43,7 +43,7 @@ index 57c7413671e..4735477f00c 100644
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 3629a8508a3..94148c9ee3e 100644
index 3629a8508a..94148c9ee3 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -58,8 +58,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj"
Expand All @@ -56,7 +56,7 @@ index 3629a8508a3..94148c9ee3e 100644
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
index c502d51833b..c1ff0c9a084 100644
index c502d51833..c1ff0c9a08 100644
--- a/PCbuild/sqlite3.vcxproj
+++ b/PCbuild/sqlite3.vcxproj
@@ -88,12 +88,12 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 893669473feed8bac87808d91796292e2e46a62c Mon Sep 17 00:00:00 2001
From 59516a93e3697cc072ff6feded17ed06dc3599ce Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sun, 3 Nov 2019 15:09:45 -0600
Subject: [PATCH 11/26] Use ranlib from env if env variable is set
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 11/26] Use ranlib from env if env variable is set
1 file changed, 3 insertions(+)

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 03b85584190..00133ded588 100644
index 03b8558419..00133ded58 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -258,6 +258,9 @@ def customize_compiler(compiler):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 48a37e85280271fe4b58eea650763837aa16b57f Mon Sep 17 00:00:00 2001
From ed4c903cceb544903cd1a94a66a8ba2ebd796c84 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 12/26] Add CondaEcosystemModifyDllSearchPath()
Expand Down Expand Up @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
1 file changed, 96 insertions(+)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 9248e971d9c..719f5b3480b 100644
index 9248e971d9..719f5b3480 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -53,6 +53,10 @@ extern void _PyIO_Fini(void);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 473086b85f1fadd849faa4c0e79c50fd10d4f8a5 Mon Sep 17 00:00:00 2001
From 5c902ea7ddad89e84a78d38c9d5423237e943b85 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 20:46:36 +0100
Subject: [PATCH 13/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 13/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
index af8099a4078..0b245adb309 100644
index af8099a407..0b245adb30 100644
--- a/Lib/distutils/_msvccompiler.py
+++ b/Lib/distutils/_msvccompiler.py
@@ -346,6 +346,13 @@ def compile(self, sources,
Expand Down
Loading
Loading