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
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/aarch64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- debug
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
DOCKER_PLATFORM:
- linux/amd64
build_type:
- release
bzip2:
Expand Down
25 changes: 0 additions & 25 deletions .circleci/config.yml

This file was deleted.

7 changes: 6 additions & 1 deletion .scripts/run_docker_build.sh

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

16 changes: 8 additions & 8 deletions README.md

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

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.9" %}
{% set version = "3.14.10" %}
{% set dev = "" %}
{% set dev_ = "" %}
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
Expand Down Expand Up @@ -64,7 +64,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: e02d9ac21cebda6e46435369744a92c65cc7cd8669697694122cf97ffacd1e53
sha256: de414a57119abef52784d8993e341d53aed635fc2b05c2607d9f98a2c5b72032
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 5ddda8cb53bf9421f0a6bfe63f6a7093adb3b9c5 Mon Sep 17 00:00:00 2001
From 705185e4ae1439cf45cc8987cb4337f5208788d3 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 8be93d494b557e9f611df3bfbd4a82641d971bb4 Mon Sep 17 00:00:00 2001
From bbb703658d328605d415a367a73df8b5d495eb78 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 fc10a54e60c90e67d3a9505c988f93093bb15e99 Mon Sep 17 00:00:00 2001
From c6b9a31264b57e60dc9b7a8ff7f82f9a14dd7640 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 Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0e48656148eaffbb5366125538c8f0a87416da70 Mon Sep 17 00:00:00 2001
From ee361028684b32b8f896f92e0f189febb6d2a2d1 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 ada8a27be4c..88252adf91d 100644
!progname_to_dict(dict, "real_executable") ||
!library_to_dict(dict, "library") ||
diff --git a/Modules/getpath.py b/Modules/getpath.py
index ce9a40e7d48..fa2893b2716 100644
index cf59ae35bba..e5e23d7c759 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -52,6 +52,7 @@
Expand All @@ -34,7 +34,7 @@ index ce9a40e7d48..fa2893b2716 100644

# ** Values calculated at runtime **
# config -- [in/out] dict of the PyConfig structure
@@ -701,7 +702,7 @@ def search_up(prefix, *landmarks, test=isfile):
@@ -717,7 +718,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 821e068338e098471e786d1a2dae60872e16df95 Mon Sep 17 00:00:00 2001
From cf126ff8afcc8df08e7554a02fcbe8fe07af4d21 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 a3f342664f1bb333bb10a3b7c2e8956c1a9f9595 Mon Sep 17 00:00:00 2001
From 25dd40b4cbede6be956369d98413dfaaae928ef5 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 7b884a9723d6445c0346a21ba97e48d8a3010796 Mon Sep 17 00:00:00 2001
From 40cd7690213477fce140004b70a293364ccd4f1b 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
8 changes: 4 additions & 4 deletions recipe/patches/0008-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e2cd422eca5af7cadf6ca922563dac3575403098 Mon Sep 17 00:00:00 2001
From 29a470667bffa1f1bde1ec4af8131c3f41f6a8d4 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 @@ -368,7 +368,7 @@ index f482734ba1d..70943daa021 100644
<Link>
<AdditionalDependencies>$(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
index ce21f992ff8..34561515c12 100644
index 16595c782b3..95f45376e61 100644
--- a/PCbuild/_ssl.vcxproj
+++ b/PCbuild/_ssl.vcxproj
@@ -96,6 +96,18 @@
Expand All @@ -389,7 +389,7 @@ index ce21f992ff8..34561515c12 100644
+ </ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ssl.c" />
<ClInclude Include="..\Modules\_ssl\distrusted_spki.h" />
diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj
index 4e721e8ce09..3fec7516ed5 100644
--- a/PCbuild/_testbuffer.vcxproj
Expand Down Expand Up @@ -720,7 +720,7 @@ index 3f8772d30b4..d80968e351a 100644
<Link>
<AdditionalDependencies>windowsapp.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 5099e44020e..b724db69bdd 100644
index 43a26c05a2a..f311d156616 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -99,7 +99,7 @@
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 5f46de1baa9972bb4c34e276f10eae9ca84a2868 Mon Sep 17 00:00:00 2001
From 4573959b5379231d79ce9dd6f065645bef903fe0 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 93339120cc4..1ea165c7c3b 100755
index 2a4b6fc96cc..772857b4cae 100755
--- a/configure
+++ b/configure
@@ -4114,6 +4114,9 @@ then
Expand All @@ -53,7 +53,7 @@ index 93339120cc4..1ea165c7c3b 100755
_host_ident=
;;
diff --git a/configure.ac b/configure.ac
index 24089d0839e..d5501eed168 100644
index f51935d8813..2ee3d5cc757 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,6 +330,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 a0a92926fabedfee953fc03db6b7a4e1d22320e2 Mon Sep 17 00:00:00 2001
From 1413df1472a51ab32d704fd8f5ff29c26c0048ba 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 1038bfb69eaf6e4504a953ea15f38fd25a3439df Mon Sep 17 00:00:00 2001
From 837ac3573cf0e257782dcb3d069a3d4202684ad4 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 27b99211ce6..1c9a3a88da5 100644
index 3956f504740..51fe8e907f4 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1510,7 +1510,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
@@ -1515,7 +1515,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 27b99211ce6..1c9a3a88da5 100644
# else
# define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \
(_dyld_shared_cache_contains_path != NULL)
@@ -1553,8 +1553,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar
@@ -1558,8 +1558,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 582b006bd530deba7f5b5fc68bb97b4987d528ed Mon Sep 17 00:00:00 2001
From 6796f0d5f6c0dc4661df2af52e7c58cc276d91e0 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 2699314c413a55d0b801040cad0bac4ec5d47587 Mon Sep 17 00:00:00 2001
From 586e25ac3962457340d187803205e688218780fe 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
2 changes: 1 addition & 1 deletion recipe/patches/0014-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From abb56989b070010c563b606936a139851053bc10 Mon Sep 17 00:00:00 2001
From d78323b00546ff2daed802bc0710a8b6c5459dd9 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
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 3c7326859ab12bebfbd57504a9c2b8cce6a737ce Mon Sep 17 00:00:00 2001
From 35ea6e0ea76e9afd8fd327df4b7070b8c4556cd6 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
Loading
Loading