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
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.

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.13.17" %}
{% set version = "3.13.18" %}
{% 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: 6020bd10aff3bf4821be16f088ebb1591beb7b811dcd8fab1da8f7c22a7b27e7
sha256: abb0102e6d4ae027509bcb82327d9dd85515b44a3ba8ad538cfc5e9847029f68
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 991f2abe6accd2070f067429d40f887cfe728847 Mon Sep 17 00:00:00 2001
From b324c1730f2c0c6ee43000948176a33319860df5 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/25] 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 c7d48c7387926b3b7403eed2e9d22df499034e9a Mon Sep 17 00:00:00 2001
From 37c48d7e973e7296531da35a5db60df85c4c9e87 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/25] Win32: Do not download externals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 20455fb7a6f55de85c6236f11e36ac8ac8cfb0e9 Mon Sep 17 00:00:00 2001
From 912dd2a1cc2a3f89eef9196c7aea22900e415b23 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/25] 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 8563e9b808b53973b24ecb460233730505fd5c74 Mon Sep 17 00:00:00 2001
From f5376852f88f72fef85c847858f20a9e135573d0 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/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
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 2a2dd9ea6d9518f5aefaa64f76fe16662605d7c3 Mon Sep 17 00:00:00 2001
From 4bfa6119fb93ae2bcbab439c7101960530b02737 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
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 2a1ad05f5324d444047d4ef8696489eb835609fb Mon Sep 17 00:00:00 2001
From 80a527a7083e2c92b3d6957f5f78bbaa31476f31 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/25] Unvendor sqlite3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 72c8f5d4c2133b6f4363f243ec1aa16ed9b43b69 Mon Sep 17 00:00:00 2001
From 9e0c1065b8bebcd947b97cf55954cbc6b16f933d 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/25] Add CondaEcosystemModifyDllSearchPath()
Expand Down
10 changes: 5 additions & 5 deletions recipe/patches/0008-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9c33dafaaccfb0d777f70f61ebec841485d4f917 Mon Sep 17 00:00:00 2001
From e8a172d7188535d66988878331f9e08a247ad188 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/25] Doing d1trimfile
Expand Down Expand Up @@ -169,7 +169,7 @@ index ee7421484b..e9d60b4db1 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index c102da85e9..8d5117e804 100644
index cd8c1ff173..c33e8e3c23 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -94,7 +94,11 @@
Expand Down Expand Up @@ -375,7 +375,7 @@ index f482734ba1..70943daa02 100644
<Link>
<AdditionalDependencies>$(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
index ce21f992ff..34561515c1 100644
index 16595c782b..95f45376e6 100644
--- a/PCbuild/_ssl.vcxproj
+++ b/PCbuild/_ssl.vcxproj
@@ -96,6 +96,18 @@
Expand All @@ -396,7 +396,7 @@ index ce21f992ff..34561515c1 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 4e721e8ce0..3fec7516ed 100644
--- a/PCbuild/_testbuffer.vcxproj
Expand Down Expand Up @@ -632,7 +632,7 @@ index 4dd42ab98a..7c2dbc7e70 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 92ecac2f7a..d517f9392b 100644
index 57d565fa28..d9b6beafb4 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -92,6 +92,10 @@
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0009-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d919b18325ee2b397f5e32fa8902118570791c21 Mon Sep 17 00:00:00 2001
From 15246153401be728be3a7d14848279a14d9a39b0 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/25] cross compile darwin
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 f909be9b501086add90d23c0b6769d9ccefd940a Mon Sep 17 00:00:00 2001
From e97d7a6daaed000ba148d44858b7dfccc800ca1c 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/25] Fix TZPATH on windows
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fcb7b10eb231c5a93678ec353df63e79f7c00f85 Mon Sep 17 00:00:00 2001
From fa0967917af97a5c5a860cc98655fa6f9ea6a25c 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/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1
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 f0175326b5046b064d8c00daf8717465bfbf7e32 Mon Sep 17 00:00:00 2001
From f21e6caf8c0fd6ea58c290fbf62c1ceeb0aaffe9 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/25] 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 ffa81e974f061ca837c06d1a6ba0bb3c683d6b02 Mon Sep 17 00:00:00 2001
From ff3abc1bfa238fe692489460a09ba71840cd5af8 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/25] 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 5b4eca524fcf440da14a54082ffba9644e072df5 Mon Sep 17 00:00:00 2001
From 43b396613b3ea80d12a9c74df377d9d84390d63f 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/25] 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 c876c1ce48c1d79386f8880bc1e163e794f7da68 Mon Sep 17 00:00:00 2001
From 057636c8e13f77332bb68f624d092622751498bc 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/25] 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 8a92097e08d33c3982e97b1e7af197bd31a352d9 Mon Sep 17 00:00:00 2001
From ec21e6df6a8d0e61544fc709055216df058b4005 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/25] unvendor zlib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4f6e994c7b09526e723fcd5fe335e7873f94f63d Mon Sep 17 00:00:00 2001
From bc7a7c5fcb5aed0a0e9878a00d3db0b48c8bab5a 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/25] Do not pass -g to GCC when not Py_DEBUG
Expand Down
Loading
Loading