-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
automerged PR by conda-forge/automerge-action
- Loading branch information
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,4 +56,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,4 +56,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,4 +60,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,4 +60,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,4 +54,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,4 +54,4 @@ zip_keys: | |
- - c_stdlib_version | ||
- cdt_name | ||
zlib: | ||
- '1.2' | ||
- '1' |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 656d027af328edb2cc196eec7e726fa62e2ce3f2 Mon Sep 17 00:00:00 2001 | ||
From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Wed, 16 Aug 2017 11:53:55 +0100 | ||
Subject: [PATCH 01/22] Win32: Change FD_SETSIZE from 512 to 2048 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 74d8297f1fb827e069ba795a00dd5cd40cd01a49 Mon Sep 17 00:00:00 2001 | ||
From 89ac50838fc3c43b63342d7b9c434fe68e11d678 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Thu, 7 Sep 2017 11:35:47 +0100 | ||
Subject: [PATCH 02/22] Win32: Do not download externals | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6acef4cee4f5107be46225f159cf5a5238f2c6bd Mon Sep 17 00:00:00 2001 | ||
From 1add97729db66a572b0ad8f26186071c6d1b19fd Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Tue, 5 Dec 2017 22:47:59 +0000 | ||
Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 842497c29a668817928af9ab966b2a63bfbcd294 Mon Sep 17 00:00:00 2001 | ||
From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Sat, 27 Oct 2018 18:48:30 +0100 | ||
Subject: [PATCH 04/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4fd9f886ff5b07c0ff51a767b147f5154e685686 Mon Sep 17 00:00:00 2001 | ||
From 91c6890e658e06e72213b8699e9c7e15ab42de55 Mon Sep 17 00:00:00 2001 | ||
From: Nehal J Wani <[email protected]> | ||
Date: Sat, 24 Nov 2018 20:38:02 -0600 | ||
Subject: [PATCH 05/22] Unvendor openssl | ||
|
@@ -144,7 +144,7 @@ index 0da6f67495..17eee400eb 100644 | |
<Target Name="CleanAll"> | ||
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" /> | ||
diff --git a/PCbuild/python.props b/PCbuild/python.props | ||
index d85fe4ab2a..cf0913f331 100644 | ||
index d799948fa3..cf0913f331 100644 | ||
--- a/PCbuild/python.props | ||
+++ b/PCbuild/python.props | ||
@@ -61,6 +61,7 @@ | ||
|
@@ -159,7 +159,7 @@ index d85fe4ab2a..cf0913f331 100644 | |
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> | ||
|
||
<PropertyGroup> | ||
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.1.0\</sqlite3Dir> | ||
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir> | ||
- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> | ||
- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> | ||
- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4437c580909034fa0e660b38cfca148bb0345f1d Mon Sep 17 00:00:00 2001 | ||
From 0a0c280aec453af0a3904a696dfc71175e6dc246 Mon Sep 17 00:00:00 2001 | ||
From: Nehal J Wani <[email protected]> | ||
Date: Tue, 5 Oct 2021 12:42:06 -0700 | ||
Subject: [PATCH 06/22] Unvendor sqlite3 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a588758d0e8935f6506e0fc9ce96ad016b918534 Mon Sep 17 00:00:00 2001 | ||
From 46d9b400457bec18d25f3977758daa76d53acbf4 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Tue, 24 Dec 2019 18:37:17 +0100 | ||
Subject: [PATCH 07/22] Add CondaEcosystemModifyDllSearchPath() | ||
|
@@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <[email protected]> | |
1 file changed, 96 insertions(+) | ||
|
||
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c | ||
index a0130fde15..e690dcf7df 100644 | ||
index 2c36527a87..84cbae8248 100644 | ||
--- a/Python/pylifecycle.c | ||
+++ b/Python/pylifecycle.c | ||
@@ -51,6 +51,10 @@ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 9f20e0ac40b761542197d65d4e188c474d42ea2b Mon Sep 17 00:00:00 2001 | ||
From 679e1d26a2d1883952ef98d191cc08242adcab12 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Tue, 31 Dec 2019 21:47:47 +0100 | ||
Subject: [PATCH 08/22] Doing d1trimfile | ||
|
@@ -418,7 +418,7 @@ index 917d7ae50f..8c7e141eea 100644 | |
<ClCompile Include="..\Modules\_testbuffer.c" /> | ||
</ItemGroup> | ||
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj | ||
index e032e67c25..288f68ee9d 100644 | ||
index 257562c75d..41bd3cc56c 100644 | ||
--- a/PCbuild/_testcapi.vcxproj | ||
+++ b/PCbuild/_testcapi.vcxproj | ||
@@ -92,6 +92,26 @@ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From edb3ba3037493e6f18c6663577bbe2ed6828f8fa Mon Sep 17 00:00:00 2001 | ||
From fae08eb999d62039e0dbbeb65761f0e4c507c471 Mon Sep 17 00:00:00 2001 | ||
From: Ray Donnelly <[email protected]> | ||
Date: Fri, 2 Oct 2020 00:03:12 +0200 | ||
Subject: [PATCH 09/22] cross compile darwin | ||
|
@@ -11,10 +11,10 @@ By Isuru Fernando. | |
3 files changed, 18 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/Lib/platform.py b/Lib/platform.py | ||
index 7bb222088d..0b1cbc98e2 100755 | ||
index c5b6048036..7470545466 100755 | ||
--- a/Lib/platform.py | ||
+++ b/Lib/platform.py | ||
@@ -458,7 +458,12 @@ def win32_ver(release='', version='', csd='', ptype=''): | ||
@@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): | ||
def _mac_ver_xml(): | ||
fn = '/System/Library/CoreServices/SystemVersion.plist' | ||
if not os.path.exists(fn): | ||
|
@@ -29,7 +29,7 @@ index 7bb222088d..0b1cbc98e2 100755 | |
try: | ||
import plistlib | ||
diff --git a/configure b/configure | ||
index be783faa24..4a3f0b6302 100755 | ||
index 6dc8a66e48..552597c021 100755 | ||
--- a/configure | ||
+++ b/configure | ||
@@ -4267,6 +4267,9 @@ then | ||
|
@@ -53,7 +53,7 @@ index be783faa24..4a3f0b6302 100755 | |
_host_cpu= | ||
;; | ||
diff --git a/configure.ac b/configure.ac | ||
index 8be26cc0ab..058f1d1096 100644 | ||
index 8a32cb58f4..36b565af1b 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -547,6 +547,9 @@ then | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 021e22856ef3ef90a67b0d18d4678752a7ee0ad6 Mon Sep 17 00:00:00 2001 | ||
From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e Mon Sep 17 00:00:00 2001 | ||
From: Isuru Fernando <[email protected]> | ||
Date: Wed, 7 Oct 2020 10:08:30 -0500 | ||
Subject: [PATCH 10/22] Fix TZPATH on windows | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7ab332db570ac958bbd29d1fc509c56679a726c5 Mon Sep 17 00:00:00 2001 | ||
From dfa56fb035e286513a96ab1ee60a438a61295aac Mon Sep 17 00:00:00 2001 | ||
From: Isuru Fernando <[email protected]> | ||
Date: Mon, 25 Jan 2021 03:28:08 -0600 | ||
Subject: [PATCH 11/22] Make dyld search work with SYSTEM_VERSION_COMPAT=1 | ||
|