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
8 changes: 3 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% set version = "3.11.15" %}
{% set version = "3.11.16" %}
{% 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 @@ source:
{% else %}
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
# sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
sha256: 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625
sha256: 91bcdebfdde239a003ae93738a7fce0f9230fee5c4bc2b86f6e6e8c6f98aabe8
{% endif %}
patches:
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
Expand Down Expand Up @@ -82,8 +82,6 @@ source:
- patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
- patches/0025-Unvendor-expat.patch
- patches/0026-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
# backport https://github.com/python/cpython/pull/100373
- patches/0027-gh-100372-Use-BIO_eof-to-detect-EOF-for-SSL_FILETYPE.patch

build:
number: {{ build_number }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9a7eda9dc9742996c5e081db78c7d3246df7c4c6 Mon Sep 17 00:00:00 2001
From 8eb7c74e3d63c41284cd86f9d24b18921b163a5c 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/27] Win32: Change FD_SETSIZE from 512 to 2048
Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048

https://github.com/ContinuumIO/anaconda-issues/issues/1241
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 22b3ebb0410b3382435eb2b33ba0e832972ce31d Mon Sep 17 00:00:00 2001
From af5b00d49fc6265c34a632cf802679a5ab8b5ad0 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Wed, 16 Aug 2017 11:59:00 +0100
Subject: [PATCH 02/27] Win32: distutils: Add support to cygwinccompiler for
Subject: [PATCH 02/26] Win32: distutils: Add support to cygwinccompiler for
VS>=2015

Really this is for mingw-w64 though
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7fefe7f31a0abdaf54004aece9dc0849ca9765b2 Mon Sep 17 00:00:00 2001
From 58efb8731689f5d8ce622dfd6b7692c2960f8e7a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Tue, 21 Sep 2021 13:05:20 -0500
Subject: [PATCH 03/27] bpo-45258: search for -isysroot in addition to
Subject: [PATCH 03/26] bpo-45258: search for -isysroot in addition to
--sysroot

-isysroot is for macOS, while --sysroot is for gcc/linux
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a681a384e84095bbb5d7acd51cbda182710e8288 Mon Sep 17 00:00:00 2001
From d649520549299bc33c21620365716bd7699a4c47 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 5 Oct 2017 02:00:41 +0100
Subject: [PATCH 04/27] runtime_library_dir_option: Use 1st word of CC as
Subject: [PATCH 04/26] runtime_library_dir_option: Use 1st word of CC as
compiler

Previous, 'CC' got passed to os.path.basename, so any paths in it after
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-Win32-Do-not-download-externals.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d87162d367ee4e70ff0de0ef0bf52f9284528051 Mon Sep 17 00:00:00 2001
From 9c33088d170fd21776f551f1ce8a301a2730ae4c 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 05/27] Win32: Do not download externals
Subject: [PATCH 05/26] Win32: Do not download externals

---
PCbuild/build.bat | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c03b4821890811e2f1a0be4ab621bcdf8e3ef4d7 Mon Sep 17 00:00:00 2001
From 235500939927a8f75fc2f0dab3436870065f5734 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 06/27] Fix find_library so that it looks in sys.prefix/lib
Subject: [PATCH 06/26] Fix find_library so that it looks in sys.prefix/lib
first

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From cf0626c5ef3ce26b742e3761d19f3c662eaea926 Mon Sep 17 00:00:00 2001
From 260d5bfd0af51d3f2fe2c54fd17e33303b54bdb7 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Thu, 16 Sep 2021 15:46:09 -0500
Subject: [PATCH 07/27] bpo-22699: Allow compiling on debian/ubuntu with a
Subject: [PATCH 07/26] bpo-22699: Allow compiling on debian/ubuntu with a
different compiler

This PR fixes one issue mentioned in the bpo
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 79f4df3a44f5ccc31795fdfa3e93502b436aaa50 Mon Sep 17 00:00:00 2001
From 19604dc69f63146a47a07c30b11676c4973a39a1 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 08/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
Subject: [PATCH 08/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
is not 0

Co-authored-by: Isuru Fernando<isuruf@gmail.com>
Expand All @@ -23,7 +23,7 @@ index 61d654065fd..b80297c580c 100644
!progname_to_dict(dict, "real_executable") ||
!library_to_dict(dict, "library") ||
diff --git a/Modules/getpath.py b/Modules/getpath.py
index 74f918cf28e..0726b9932c6 100644
index a7dd7342d4d..054862c05ce 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -51,6 +51,7 @@
Expand All @@ -34,7 +34,7 @@ index 74f918cf28e..0726b9932c6 100644

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

Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0009-Unvendor-openssl.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a7a02cea51b83a8a8cc3feb771b9f4ac61e853f6 Mon Sep 17 00:00:00 2001
From cfb0b7d01dd5f3d035a78ada6c4a05e218a834bc 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 09/27] Unvendor openssl
Subject: [PATCH 09/26] Unvendor openssl

Co-authored-by: Isuru Fernando <isuruf@gmail.com>
---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0010-Unvendor-sqlite3.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a95d07a73d5dd38cf69b3b7a7ea1e103032f1c0a Mon Sep 17 00:00:00 2001
From d352b98ae39b333f8709d3a00002d7956360afd4 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 10/27] Unvendor sqlite3
Subject: [PATCH 10/26] Unvendor sqlite3

---
PCbuild/_sqlite3.vcxproj | 11 +++++------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b433af6400f676e354786cfe2f2944c314b8c2b7 Mon Sep 17 00:00:00 2001
From 893669473feed8bac87808d91796292e2e46a62c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sun, 3 Nov 2019 15:09:45 -0600
Subject: [PATCH 11/27] Use ranlib from env if env variable is set
Subject: [PATCH 11/26] Use ranlib from env if env variable is set

---
Lib/distutils/sysconfig.py | 3 +++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6928b97faf3e2d7abf06b268e0533fdc66af022a Mon Sep 17 00:00:00 2001
From 48a37e85280271fe4b58eea650763837aa16b57f 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 12/27] Add CondaEcosystemModifyDllSearchPath()
Subject: [PATCH 12/26] 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ac099b810a66b3243af276957aefe32fad3fae93 Mon Sep 17 00:00:00 2001
From 473086b85f1fadd849faa4c0e79c50fd10d4f8a5 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 31 Dec 2019 20:46:36 +0100
Subject: [PATCH 13/27] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
Subject: [PATCH 13/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable

---
Lib/distutils/_msvccompiler.py | 9 ++++++++-
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0014-Doing-d1trimfile.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From af79c715415f62c4818099e1ad40e893dfa2f58d Mon Sep 17 00:00:00 2001
From cbe5961b208d16f60d577e6c8c2e9f50c8d4d799 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 14/27] Doing d1trimfile
Subject: [PATCH 14/26] Doing d1trimfile

---
PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++
Expand Down Expand Up @@ -156,7 +156,7 @@ index 0916f1a2d37..17a4cbfcd7c 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 8da5244bac0..20cc09d63ff 100644
index e7b7a6d2064..964c95c9f7e 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -94,7 +94,11 @@
Expand Down Expand Up @@ -586,7 +586,7 @@ index 4dd42ab98a9..7c2dbc7e701 100644
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index 001f8afd89b..3be4ac06dd8 100644
index 97eb7338dca..d159933293a 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -92,6 +92,10 @@
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0015-cross-compile-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 65796485aad9113b473df540f307778f91253baa Mon Sep 17 00:00:00 2001
From ac34973e1dd84854fbe47af0b52ee3d4248f5cb5 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 15/27] cross compile darwin
Subject: [PATCH 15/26] cross compile darwin

By Isuru Fernando.
---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0016-Fix-TZPATH-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4f9ef5a955d3214f76470512320601a7a7b8d162 Mon Sep 17 00:00:00 2001
From f1ac808992a6494c4383eb0a899119997a510db6 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 7 Oct 2020 10:08:30 -0500
Subject: [PATCH 16/27] Fix TZPATH on windows
Subject: [PATCH 16/26] Fix TZPATH on windows

---
Lib/sysconfig.py | 1 +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 26b681dcb1f2242e124b099de5db93613efbf628 Mon Sep 17 00:00:00 2001
From e99db3477847075e785103dba6a6e0b9f6ef4aeb Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 25 Jan 2021 03:28:08 -0600
Subject: [PATCH 17/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1
Subject: [PATCH 17/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1

In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15`
or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8574a0efce79ca9a31e1d8e34fbe223bad316c13 Mon Sep 17 00:00:00 2001
From b0b4c4ad5575274bfd4d82eeec968bcd214b6eb1 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:18:50 -0700
Subject: [PATCH 18/27] Fix LDSHARED when CC is overriden on Linux too
Subject: [PATCH 18/26] Fix LDSHARED when CC is overriden on Linux too

---
Lib/distutils/sysconfig.py | 5 ++---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0019-Unvendor-bzip2.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5fec0f5f0301cce5ab58c7d90332dec13a0c6134 Mon Sep 17 00:00:00 2001
From 01406f2bf1c3770f3200e552761af365cfa707bd Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 02:56:27 -0700
Subject: [PATCH 19/27] Unvendor bzip2
Subject: [PATCH 19/26] Unvendor bzip2

---
PCbuild/_bz2.vcxproj | 15 +++++----------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0020-Unvendor-libffi.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7708ae7b860b591ab3ee28e88e9e04aee4b26dd6 Mon Sep 17 00:00:00 2001
From e1b0e3f44500ebde0a6165bdb749a5058bbbdd6d Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 16 Aug 2021 03:07:40 -0700
Subject: [PATCH 20/27] Unvendor libffi
Subject: [PATCH 20/26] Unvendor libffi

---
PCbuild/libffi.props | 17 ++++-------------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0021-Unvendor-tcltk.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b57b04b19f7495ad1f9bbe562fd846f33382fa36 Mon Sep 17 00:00:00 2001
From 52385ddb6ee59df88cd0ffc46f46ec7253784362 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 20 Aug 2021 10:23:51 -0700
Subject: [PATCH 21/27] Unvendor tcltk
Subject: [PATCH 21/26] Unvendor tcltk

---
PCbuild/tcltk.props | 12 +++++-------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0022-unvendor-xz.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 80f627bf8604ea4e647516fdf3ef06903a79f8e7 Mon Sep 17 00:00:00 2001
From dea9e0a7b44a61cb93a5910a45e4cc076c4a9de4 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Sat, 25 Sep 2021 10:07:05 -0700
Subject: [PATCH 22/27] unvendor xz
Subject: [PATCH 22/26] unvendor xz

---
PCbuild/_lzma.vcxproj | 10 +++-------
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0023-unvendor-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bceba983ea3bcae3a3d12cc1fe991815ec1a155f Mon Sep 17 00:00:00 2001
From 6747f2071fab887b05408687c52112897b7e3cd1 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Wed, 29 Sep 2021 15:21:55 -0700
Subject: [PATCH 23/27] unvendor zlib
Subject: [PATCH 23/26] unvendor zlib

---
PCbuild/pythoncore.vcxproj | 33 ++-------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 47bdd6a741f1b742dad262021891a8f3340994cf Mon Sep 17 00:00:00 2001
From fc56cf9205c9663a26d07d91d070d8f324772aa8 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 24/27] Do not pass -g to GCC when not Py_DEBUG
Subject: [PATCH 24/26] Do not pass -g to GCC when not Py_DEBUG

This bloats our exe and our modules a lot.
---
Expand Down
Loading
Loading