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
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.14.6" %}
{% set version = "3.14.7" %}
{% 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 @@ -46,7 +46,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 }}{{ dev }}/
sha256: 143b1dddefaec3bd2e21e3b839b34a2b7fb9842272883c576420d605e9f30c63
sha256: 3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
- patches/0002-Win32-Do-not-download-externals.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 48fcc7c4d3d88ca7ffab052cfbee27512901d458 Mon Sep 17 00:00:00 2001
From 204c40c00697419f29b214864bab80a8f01d804f 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 Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d27b283f6f7b7372271cc862a0a0ae426815010e Mon Sep 17 00:00:00 2001
From aaa85ea3a1edeb2e93ae12b60c7958084814df37 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/26] Win32: Do not download externals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8eec70e4cde56e34cef8d23083a08b9b4833d20d Mon Sep 17 00:00:00 2001
From 43ac24ca1c1083b50966846f07969a9c6454e22f 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/26] Fix find_library so that it looks in sys.prefix/lib
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 3b21658433b..2c900c1e2cf 100644
index cd67fd87efc..9acb6e8c25f 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -135,7 +135,8 @@ def dllist():
Expand All @@ -38,7 +38,7 @@ index 3b21658433b..2c900c1e2cf 100644
'%s.dylib' % name,
'%s.framework/%s' % (name, name)]
for name in possible:
@@ -436,10 +437,30 @@ def _findLib_ld(name):
@@ -435,10 +436,30 @@ def _findLib_ld(name):
pass # result will be None
return result

Expand Down Expand Up @@ -70,4 +70,4 @@ index 3b21658433b..2c900c1e2cf 100644
+ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name))


# Listing loaded libraries on other systems will try to use
# On platforms which provide dl_iterate_phdr(), dllist() is implemented
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6ef047bc92544cc2bb50f89d6f1746397efb4b04 Mon Sep 17 00:00:00 2001
From 21533f279cfe2060e7aa355b860547e7982b5c89 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/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Expand All @@ -23,7 +23,7 @@ index 1e75993480a..ff96c8e1990 100644
!progname_to_dict(dict, "real_executable") ||
!library_to_dict(dict, "library") ||
diff --git a/Modules/getpath.py b/Modules/getpath.py
index b89d7427e3f..21df0efac12 100644
index 0e4f1e87e73..df5d89d857a 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -52,6 +52,7 @@
Expand All @@ -34,7 +34,7 @@ index b89d7427e3f..21df0efac12 100644

# ** Values calculated at runtime **
# config -- [in/out] dict of the PyConfig structure
@@ -704,7 +705,7 @@ def search_up(prefix, *landmarks, test=isfile):
@@ -697,7 +698,7 @@ def search_up(prefix, *landmarks, test=isfile):
else:
pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK))

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 aabd5c80763b1ce8c1220b9febccccc590ca7611 Mon Sep 17 00:00:00 2001
From 91c3e5bdab6497eca2cfcb6838df9dc3d8317726 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/26] 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 ef9755d84ef3dfd8fdbe8e10363528da21afe502 Mon Sep 17 00:00:00 2001
From 6fa5924da6eddfc530015bef11bc498913c630b1 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/26] Unvendor sqlite3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From aeb6945890d75f21e022290f811bb0bd000e3369 Mon Sep 17 00:00:00 2001
From e2a8b753a8c2420a2f0b793a40725264a116bbda 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/26] Add CondaEcosystemModifyDllSearchPath()
Expand Down Expand Up @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
1 file changed, 95 insertions(+)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 6241d6ddca1..fe2120940d2 100644
index fe55ec7caff..cabd42067d7 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -80,6 +80,10 @@
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 942cda22db307772ca4254743eae0f7bcc328641 Mon Sep 17 00:00:00 2001
From efdb6286b645c1c277f4c12f468a7bde97e876cc 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/26] Doing d1trimfile
Expand Down Expand Up @@ -162,7 +162,7 @@ index ee7421484b5..e9d60b4db1a 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 3eb9c89bcb6..920656f2ee2 100644
index 46e34a5ea82..fb1589557da 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -94,7 +94,11 @@
Expand Down Expand Up @@ -618,7 +618,7 @@ index 97938692328..212fb5e1ebc 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index dc9161a8b29..3bcef600a3e 100644
index 8499402f0a9..833ab5e9f7e 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -92,6 +92,10 @@
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0009-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 803aeaea8d4b1f6f62bf208a9c826664af1cc24c Mon Sep 17 00:00:00 2001
From 91eb356ef711a6d9119a017f3572941e174360f9 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 2 Oct 2020 00:03:12 +0200
Subject: [PATCH 09/26] cross compile darwin
Expand Down Expand Up @@ -29,7 +29,7 @@ index b017b841311..f7821ae7f28 100644
try:
import plistlib
diff --git a/configure b/configure
index 2088290f0ee..13fa7eb8101 100755
index 2cb22a7806f..ad513bfe5fd 100755
--- a/configure
+++ b/configure
@@ -4112,6 +4112,9 @@ then
Expand All @@ -53,7 +53,7 @@ index 2088290f0ee..13fa7eb8101 100755
_host_ident=
;;
diff --git a/configure.ac b/configure.ac
index aed14946731..fcc0e58963e 100644
index 967d34d47a3..68998aedfbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,6 +324,9 @@ then
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0010-Fix-TZPATH-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 44df125643cd6cc308950430410ea157becfbb30 Mon Sep 17 00:00:00 2001
From 57cb150a6af3b99bdde019fbece1f751e839d68b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH 10/26] Fix TZPATH on windows
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 865dd0bfac76b1e793d0a8d70e736c3c79e3d5f6 Mon Sep 17 00:00:00 2001
From b35fc75f5d8900881707f9aed502d11afda49193 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 25 Jan 2021 03:28:08 -0600
Subject: [PATCH 11/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1
Expand All @@ -18,10 +18,10 @@ and this code using 10.16
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 856b0376e5e..8d269ac5969 100644
index 27b99211ce6..1c9a3a88da5 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1509,7 +1509,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
@@ -1510,7 +1510,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH
# ifdef HAVE_BUILTIN_AVAILABLE
# define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
Expand All @@ -30,7 +30,7 @@ index 856b0376e5e..8d269ac5969 100644
# else
# define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
(_dyld_shared_cache_contains_path != NULL)
@@ -1552,8 +1552,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar
@@ -1553,8 +1553,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar
if (PyUnicode_FSConverter(name, &name2) == 0)
return NULL;
name_str = PyBytes_AS_STRING(name2);
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0012-Unvendor-bzip2.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 04122ddcb01d55991402257c11217b6b6cb4ff26 Mon Sep 17 00:00:00 2001
From e0552ce78971ed4ad8f5e36bf4929812eb619f05 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:56:27 -0700
Subject: [PATCH 12/26] Unvendor bzip2
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0013-Unvendor-libffi.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0cf3e68100c1c4bb1bc4a1aee5e6d9b2682af821 Mon Sep 17 00:00:00 2001
From b166bc9151cfa8743e9a54ebd29db8634096fc1c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 03:07:40 -0700
Subject: [PATCH 13/26] Unvendor libffi
Expand Down
14 changes: 8 additions & 6 deletions recipe/patches/0014-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 771b7e5d29f2dabe5c5af3544cd52d942969fc87 Mon Sep 17 00:00:00 2001
From 7f7156f13b05bc456b470c4c174d52c7f3b52ceb Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 20 Aug 2021 10:23:51 -0700
Subject: [PATCH 14/26] Unvendor tcltk

---
PCbuild/_tkinter.vcxproj | 6 ------
PCbuild/tcltk.props | 11 +++++------
2 files changed, 5 insertions(+), 12 deletions(-)
PCbuild/tcltk.props | 13 +++++--------
2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
index de9358312ac..3fe2c29c823 100644
Expand All @@ -26,14 +26,16 @@ index de9358312ac..3fe2c29c823 100644
<WriteLinesToFile File="$(OutDir)TCL_LIBRARY.env" Lines="$(tcltkdir)\lib\tcl$(TclMajorVersion).$(TclMinorVersion)" Encoding="utf-8" Overwrite="true" />
</Target>
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index d26b36ba98e..40327f181d8 100644
index 1ab8e96122a..f99f4e5d27e 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -12,12 +12,11 @@
@@ -12,14 +12,11 @@
<TkMinorVersion>$([System.Version]::Parse($(TkVersion)).Minor)</TkMinorVersion>
<TkPatchLevel>$([System.Version]::Parse($(TkVersion)).Build)</TkPatchLevel>
<TkRevision>$([System.Version]::Parse($(TkVersion)).Revision)</TkRevision>
- <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir>
- <!-- Back compat hack. If you're here wondering about -core vs not, do us both a favor and just override the whole tclDir variable -->
- <tclDir Condition="$(tclDir) == '' and $(TclMajorVersion) == '8'">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir>
- <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-$(TclVersion)\</tclDir>
- <tkDir Condition="$(tkDir) == ''">$(ExternalsDir)tk-$(TkVersion)\</tkDir>
- <tcltkDir Condition="$(tcltkDir) == ''">$(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\</tcltkDir>
- <tclWin32Exe Condition="$(Platform) == 'Win32'">$(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe>
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0015-unvendor-xz.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3f4fd834df73f0d1329f4978eaca3115d6421cea Mon Sep 17 00:00:00 2001
From 0ae25243be05283e8a83c99fa3a4f28a2e1cff46 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 25 Sep 2021 10:07:05 -0700
Subject: [PATCH 15/26] unvendor xz
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0016-unvendor-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ab500d12752b39f04c8aca04b6fe1249ae38ef51 Mon Sep 17 00:00:00 2001
From e44bde2691911111f212ebe0ba71cfc0257e089c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Sep 2021 15:21:55 -0700
Subject: [PATCH 16/26] unvendor zlib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 719981a07f9546b08648c1e80d7d42224dd6ed9a Mon Sep 17 00:00:00 2001
From 3ee4e754b55463e3c412e0bfeaeaa2894ca19aae Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:45:28 +0100
Subject: [PATCH 17/26] Do not pass -g to GCC when not Py_DEBUG
Expand All @@ -10,7 +10,7 @@ This bloats our exe and our modules a lot.
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 13fa7eb8101..c47039af150 100755
index ad513bfe5fd..b8c58985cc1 100755
--- a/configure
+++ b/configure
@@ -5796,9 +5796,9 @@ if test $ac_test_CFLAGS; then
Expand All @@ -35,7 +35,7 @@ index 13fa7eb8101..c47039af150 100755
;;
*)
diff --git a/configure.ac b/configure.ac
index fcc0e58963e..3969e38be04 100644
index 68998aedfbc..0318563343a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2339,7 +2339,7 @@ then
Expand Down
Loading
Loading