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
2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ gil_type:
- normal
# Will be enabled as part of https://anaconda.atlassian.net/browse/PKG-5855
- disabled # [not (s390x or (osx and x86_64))]
tk:
- '9.0'
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "3.14.6" %}
{% set version = "3.14.7" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
Expand Down Expand Up @@ -62,7 +62,7 @@ source:
{% else %}
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
sha256: 143b1dddefaec3bd2e21e3b839b34a2b7fb9842272883c576420d605e9f30c63
sha256: 3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81
{% endif %}
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 285d30e99ac555177c551c112798cc79720f676e Mon Sep 17 00:00:00 2001
From 6ead9103b3a334356358848eae37950a83158e2d 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
Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048

https://github.com/ContinuumIO/anaconda-issues/issues/1241
---
Modules/selectmodule.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index d234d504cb5..3856307c611 100644
index 42bf1157ccc..fb3c27a9ac5 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -44,7 +44,7 @@
Expand All @@ -22,5 +22,5 @@ index d234d504cb5..3856307c611 100644

#if defined(HAVE_POLL_H)
--
2.50.1 (Apple Git-155)
2.51.0

6 changes: 3 additions & 3 deletions recipe/patches/0002-Win32-Do-not-download-externals.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2e62556e56120f7b6d15ba97fdf8733deebb9ea9 Mon Sep 17 00:00:00 2001
From 106d71e2ffd4f249afefae6a3485874b4e9641bd 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
Subject: [PATCH 02/25] Win32: Do not download externals

---
PCbuild/build.bat | 2 +-
Expand All @@ -21,5 +21,5 @@ index 60235704886..867a352057f 100644
if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" (
if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" (
--
2.50.1 (Apple Git-155)
2.51.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c48a3c1cc321e00bd361f5fce271a18c03c4a202 Mon Sep 17 00:00:00 2001
From 9f00d8a456fa870a054ebd2e42bfb32487507ef8 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
Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib
first

---
Expand All @@ -25,10 +25,10 @@ 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 378f12167c6..bf45580ab9f 100644
index cd67fd87efc..a31f8eaf57c 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -129,7 +129,8 @@ def dllist():
@@ -135,7 +135,8 @@ def dllist():
elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
from ctypes.macholib.dyld import dyld_find as _dyld_find
def find_library(name):
Expand All @@ -38,7 +38,7 @@ index 378f12167c6..bf45580ab9f 100644
'%s.dylib' % name,
'%s.framework/%s' % (name, name)]
for name in possible:
@@ -430,10 +431,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,7 +70,7 @@ index 378f12167c6..bf45580ab9f 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
--
2.50.1 (Apple Git-155)
2.51.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4435da9460f82ce6c96c4b92f58eab6edfc90da1 Mon Sep 17 00:00:00 2001
From 0a298532b4deaa5662a6eea4e3686de69899a3a2 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
Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
is not 0

Co-authored-by: Isuru Fernando<isuruf@gmail.com>
Expand All @@ -25,7 +25,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 @@ -36,7 +36,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 Expand Up @@ -1197,5 +1197,5 @@ index 00000000000..a73ea8a0e91
+ return hPython3 != NULL;
+}
--
2.50.1 (Apple Git-155)
2.51.0

84 changes: 42 additions & 42 deletions recipe/patches/0005-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
From 04cfcc1728485e2fbdd04f1c34425e8377b72c61 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
Co-authored-by: Isuru Fernando <isuruf@gmail.com>
---
PCbuild/openssl.props | 14 ++------------
PCbuild/openssl.vcxproj | 32 --------------------------------
PCbuild/python.props | 27 ++++++++++++++-------------
PCbuild/python.vcxproj | 3 +++
PCbuild/pythonw.vcxproj | 3 +++
5 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index 5fd708b211e..044cefd95ea 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -2,10 +2,10 @@
From 11f9c0e576bbd13b5fdfab12c2b340114db44f9d 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/25] Unvendor openssl

Co-authored-by: Isuru Fernando <isuruf@gmail.com>
---
PCbuild/openssl.props | 14 ++------------
PCbuild/openssl.vcxproj | 32 --------------------------------
PCbuild/python.props | 13 +------------
PCbuild/python.vcxproj | 3 +++
PCbuild/pythonw.vcxproj | 3 +++
5 files changed, 9 insertions(+), 56 deletions(-)

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index 5fd708b211e..044cefd95ea 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -2,10 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
Expand All @@ -29,7 +29,7 @@ index 5fd708b211e..044cefd95ea 100644
<AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -21,14 +21,4 @@
@@ -21,14 +21,4 @@
<_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" />
<_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" />
</ItemGroup>
Expand All @@ -44,11 +44,11 @@ index 5fd708b211e..044cefd95ea 100644
- <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
- </Target>
</Project>
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
index 7ca750dda8f..17eee400ebb 100644
--- a/PCbuild/openssl.vcxproj
+++ b/PCbuild/openssl.vcxproj
@@ -60,40 +60,8 @@
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
index 7ca750dda8f..17eee400ebb 100644
--- a/PCbuild/openssl.vcxproj
+++ b/PCbuild/openssl.vcxproj
@@ -60,40 +60,8 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="pyproject.props" />

Expand Down Expand Up @@ -89,19 +89,19 @@ index 7ca750dda8f..17eee400ebb 100644
<Target Name="Clean" />
<Target Name="CleanAll">
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
diff --git a/PCbuild/python.props b/PCbuild/python.props
index ce4a7781fbd..253aa66f477 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -68,6 +68,7 @@
diff --git a/PCbuild/python.props b/PCbuild/python.props
index ce4a7781fbd..253aa66f477 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -68,6 +68,7 @@
<!-- Directories of external projects. tcltk is handled in tcltk.props -->
<PropertyGroup>
<ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
+ <condaDir>$(LIBRARY_PREFIX)\</condaDir>
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
</PropertyGroup>
@@ -75,20 +76,8 @@
@@ -75,20 +76,8 @@
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />

<PropertyGroup>
Expand All @@ -122,11 +122,11 @@ index ce4a7781fbd..253aa66f477 100644
</PropertyGroup>

<PropertyGroup>
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 70dabaa3c8b..255be6ab910 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -110,6 +110,9 @@
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 70dabaa3c8b..255be6ab910 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -110,6 +110,9 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Programs\python.c" />
Expand All @@ -136,11 +136,11 @@ index 70dabaa3c8b..255be6ab910 100644
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index c6a5b8ce90a..8645a7bf438 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -105,6 +105,9 @@
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
index c6a5b8ce90a..8645a7bf438 100644
--- a/PCbuild/pythonw.vcxproj
+++ b/PCbuild/pythonw.vcxproj
@@ -105,6 +105,9 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\PC\WinMain.c" />
Expand All @@ -151,5 +151,5 @@ index c6a5b8ce90a..8645a7bf438 100644
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
--
2.50.1 (Apple Git-155)
2.51.0

6 changes: 3 additions & 3 deletions recipe/patches/0006-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d5656337151f4e876436e7baa7dc01b4f907c5b6 Mon Sep 17 00:00:00 2001
From 5ddbe4fa679e82d2beeda9f8ee0b570919093b60 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
Subject: [PATCH 06/25] Unvendor sqlite3

---
PCbuild/_sqlite3.vcxproj | 9 ++++-----
Expand Down Expand Up @@ -75,5 +75,5 @@ index f12ec348b37..f9e5e449a49 100644
<ItemDefinitionGroup>
<ClCompile>
--
2.50.1 (Apple Git-155)
2.51.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9acbf2d73db9c5cbca2c31d913411994b809cf89 Mon Sep 17 00:00:00 2001
From 8799d36977a4e58cb07e0367855cd712c42c8f95 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()
Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath()

The python interpreter is modifed so that it works as if the python interpreter
was called with the following conda directories.
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 352787c6495..4fd4fcb0f6e 100644
index fe55ec7caff..cabd42067d7 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -80,6 +80,10 @@
Expand Down Expand Up @@ -153,5 +153,5 @@ index 352787c6495..4fd4fcb0f6e 100644
}

--
2.50.1 (Apple Git-155)
2.51.0

12 changes: 6 additions & 6 deletions recipe/patches/0008-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6250a23c4f7ca2373a6f3208deaaf1cc26f12eb5 Mon Sep 17 00:00:00 2001
From abc68c8f944bc9d6800889e42f4dd23c940953c4 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
Subject: [PATCH 08/25] Doing d1trimfile

---
PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++
Expand Down Expand Up @@ -155,7 +155,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 @@ -394,7 +394,7 @@ index 4e721e8ce09..048adde0951 100644
<ClCompile Include="..\Modules\_testbuffer.c" />
</ItemGroup>
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
index a68f15d25aa..5c42f15c312 100644
index 51c4bcc6b47..ccc81a417fa 100644
--- a/PCbuild/_testcapi.vcxproj
+++ b/PCbuild/_testcapi.vcxproj
@@ -92,6 +92,26 @@
Expand Down Expand Up @@ -563,7 +563,7 @@ index 97938692328..64b1d443cfa 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 Expand Up @@ -862,5 +862,5 @@ index 3f4d4463f24..2572449ba0c 100644
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
--
2.50.1 (Apple Git-155)
2.51.0

Loading