V3.8.6

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.8.5" %}
+{% set version = "3.8.6" %}
 {% set linkage_nature = os.environ.get('PY_INTERP_LINKAGE_NATURE', '') %}
 {% set debug = os.environ.get('PY_INTERP_DEBUG', '') %}
 {% if linkage_nature != '' %}
@@ -15,41 +15,43 @@ package:
 source:
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-385/
-    md5: 35b5a3d0254c1c59be9736373d429db7
+    md5: 69e73c49eeb1a853cefd26d18c9d069d
     patches:
-      - patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch
+      - patches/0001-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch
 {% if 'conda-forge' not in channel_targets %}
-      - patches/0001-Add-Anaconda-Distribution-version-logic.patch
+      - patches/0002-Add-Anaconda-Distribution-version-logic.patch
 {% endif %}
-      - patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch
-      - patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
-      - patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
-      - patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
-      - patches/0006-Support-cross-compiling-byte-code.patch
-      - patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch
-      - patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch
-      - patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
-      - patches/0010-Win32-Do-not-download-externals.patch
-      - patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch
-      - patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
-      - patches/0013-Disable-new-dtags-in-unixccompiler.py.patch
-      - patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch
-      - patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
-      - patches/0016-Unvendor-openssl.patch
-      - patches/0017-Unvendor-sqlite3.patch
+      - patches/0003-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch
+      - patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
+      - patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
+      - patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+      - patches/0007-Support-cross-compiling-byte-code.patch
+      - patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch
+      - patches/0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch
+      - patches/0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
+      - patches/0011-Win32-Do-not-download-externals.patch
+      - patches/0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch
+      - patches/0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
+      - patches/0014-Disable-new-dtags-in-unixccompiler.py.patch
+      - patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch
+      - patches/0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
+      - patches/0017-Unvendor-openssl.patch
+      - patches/0018-Unvendor-sqlite3.patch
       # https://bugs.python.org/issue35644
-      - patches/0018-venv-Revert-a-change-from-https-hub.lumenfield.work-python-cp.patch
-      - patches/0019-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch
-      - patches/0020-Use-ranlib-from-env-if-env-variable-is-set.patch
-      - patches/0021-roll-back-2e33ecd-for-py_compile.main.patch
+      - patches/0019-venv-Revert-a-change-from-https-hub.lumenfield.work-python-cp.patch
+      - patches/0020-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch
+      - patches/0021-Use-ranlib-from-env-if-env-variable-is-set.patch
       # Python 3.8 is pretty broken without this.
       - patches/0022-Add-CondaEcosystemModifyDllSearchPath.patch
-      - patches/0026-Revert-part-of-https-bugs.python.org-issue33895-http.patch
-      - patches/0027-cross-compile-darwin.patch
-      - patches/gh21114.patch
-      - patches/gh21241.patch
-      - patches/gh21228.patch
-      - patches/gh21564.patch  # [osx and arm64]
+      - patches/0023-Revert-part-of-https-bugs.python.org-issue33895-http.patch
+      - patches/0024-cross-compile-darwin.patch.patch
+      - patches/0025-BPO-41101-Support-arm64-in-Mac-Tools-pythonw.patch
+      - patches/0026-fix-_decimal-for-arm64-Mac-OS.patch
+      - patches/0027-Added-by-blurb_it.patch
+      - patches/0028-ctypes-check-_dyld_shared_cache_contains_path-in-fin.patch
+      - patches/0029-fix-test_macholib-for-Mac-OS-11.patch
+      - patches/0030-Xcode-12-Beta-4-declares-_dyld_shared_cache_contains.patch
+      - patches/0031-gh21564.patch.patch  # [osx and arm64]
 
   # TODO :: Depend on our own packages for these:
   - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip          # [win]
@@ -83,7 +85,7 @@ source:
     sha256: 4872e72e188a5aa1124db0c3b163a4163e84ead359a514d86dd7c6fa2d2ff02a         # [win]
 
 build:
-  number: 9
+  number: 0
   script_env:
     - PY_INTERP_LINKAGE_NATURE
     - PY_INTERP_DEBUG
@@ -268,6 +270,7 @@ about:
   dev_url: https://docs.python.org/devguide/
 
 extra:
+  feedstock-name: python
   recipe-maintainers:
     - isuruf
     - jakirkham

recipe/patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch → recipe/patches/0001-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch

@@ -1,7 +1,7 @@
-From 48755cdaaeb7e4ab82d1b96cc80c0ab67a0c7b0d Mon Sep 17 00:00:00 2001
+From ff73ed68d55b4e19fa12c9c743c75df513cf9ca2 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 12 Apr 2020 18:22:21 +0200
-Subject: [PATCH 00/26] Fix off-by-one-error in
+Subject: [PATCH 01/31] Fix off-by-one-error in
  _winapi_WaitForMultipleObjects_impl
 
 ---
@@ -22,5 +22,5 @@ index 647075cdb1..aec836ad82 100644
                       "need at most %zd handles, got a sequence of length %zd",
                       MAXIMUM_WAIT_OBJECTS - 1, nhandles);
 -- 
-2.24.3 (Apple Git-128)
+2.28.0
 

recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch → recipe/patches/0002-Add-Anaconda-Distribution-version-logic.patch

@@ -1,7 +1,7 @@
-From 82cbac6e16381c7c0f6f096f5be97e361d262402 Mon Sep 17 00:00:00 2001
+From 15ee989aff78d9f18f4bec79bff3cb8d28baa890 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 15 Aug 2017 22:34:16 +0100
-Subject: [PATCH 01/22] Add Anaconda Distribution version logic
+Subject: [PATCH 02/31] Add Anaconda Distribution version logic
 
 ---
  Include/pylifecycle.h |  1 +
@@ -11,7 +11,7 @@ Subject: [PATCH 01/22] Add Anaconda Distribution version logic
  4 files changed, 50 insertions(+), 1 deletion(-)
 
 diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
-index c5368b3..06cb88e 100644
+index c5368b3c5e..06cb88ee9c 100644
 --- a/Include/pylifecycle.h
 +++ b/Include/pylifecycle.h
 @@ -52,6 +52,7 @@ int _Py_CheckPython3(void);
@@ -23,7 +23,7 @@ index c5368b3..06cb88e 100644
  PyAPI_FUNC(const char *) Py_GetPlatform(void);
  PyAPI_FUNC(const char *) Py_GetCopyright(void);
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 994d892..2df9c1e 100755
+index 994d892c5e..2df9c1ef92 100755
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
 @@ -943,6 +943,7 @@ def processor():
@@ -35,7 +35,7 @@ index 994d892..2df9c1e 100755
      r'(?:,\s*([\w ]*)'  # ", builddate"
      r'(?:,\s*([\w :]*))?)?\)\s*'  # ", buildtime)<space>"
 diff --git a/Modules/main.c b/Modules/main.c
-index 70be4cf..5150587 100644
+index 70be4cfacb..5150587a75 100644
 --- a/Modules/main.c
 +++ b/Modules/main.c
 @@ -204,7 +204,7 @@ pymain_header(const PyConfig *config)
@@ -48,7 +48,7 @@ index 70be4cf..5150587 100644
          fprintf(stderr, "%s\n", COPYRIGHT);
      }
 diff --git a/Python/getversion.c b/Python/getversion.c
-index c32b6f9..b5dfffb 100644
+index c32b6f9d60..b5dfffb606 100644
 --- a/Python/getversion.c
 +++ b/Python/getversion.c
 @@ -2,9 +2,56 @@
@@ -109,5 +109,5 @@ index c32b6f9..b5dfffb 100644
  Py_GetVersion(void)
  {
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch → recipe/patches/0003-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch

@@ -1,14 +1,14 @@
-From 0fcc174b9cef0d93ebf1c95fd942c1368132cfdc Mon Sep 17 00:00:00 2001
+From fa4bcb5f1681a298b7f1bfe9184b83550f28c3d3 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 08:48:16 +0100
-Subject: [PATCH 02/22] Darwin: Add -arch x86_64 to UnicCCompiler ld_args
+Subject: [PATCH 03/31] Darwin: Add -arch x86_64 to UnicCCompiler ld_args
 
 ---
- Lib/distutils/unixccompiler.py | 1 +
- 1 file changed, 1 insertion(+)
+ Lib/distutils/unixccompiler.py | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
-index 4d7a6de..3f05cf7 100644
+index 4d7a6de740..0ca7c8466a 100644
 --- a/Lib/distutils/unixccompiler.py
 +++ b/Lib/distutils/unixccompiler.py
 @@ -200,6 +200,8 @@ class UnixCCompiler(CCompiler):
@@ -21,5 +21,5 @@ index 4d7a6de..3f05cf7 100644
                  self.spawn(linker + ld_args)
              except DistutilsExecError as msg:
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch → recipe/patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,15 +1,15 @@
-From 3cfb2a1a74d411520729a6b817855fbd73f70e40 Mon Sep 17 00:00:00 2001
+From a39af2eb640918cf10e412811fe5706d83000ca0 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 03/22] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 04/31] 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 a71b642..746bae1 100644
+index a71b64223d..746bae17ab 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
 @@ -33,7 +33,7 @@
@@ -22,5 +22,5 @@ index a71b642..746bae1 100644
 
  #if defined(HAVE_POLL_H)
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch → recipe/patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch

@@ -1,7 +1,7 @@
-From d6363bb4855d87106c55f383731331dce628b8b9 Mon Sep 17 00:00:00 2001
+From e159e24dd7fb2be2dbbb6ac5dabb4c808721de91 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 04/22] Win32: distutils: Add support to cygwinccompiler for
+Subject: [PATCH 05/31] Win32: distutils: Add support to cygwinccompiler for
  VS>=2015
 
 Really this is for mingw-w64 though
@@ -10,7 +10,7 @@ Really this is for mingw-w64 though
  1 file changed, 3 insertions(+)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 6c5d777..48013e1 100644
+index 6c5d77746b..48013e1000 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -82,6 +82,9 @@ def get_msvcr():
@@ -24,5 +24,5 @@ index 6c5d777..48013e1 100644
              raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch → recipe/patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch

@@ -1,7 +1,7 @@
-From 6c2f2d4da6c31b3c2d5dbac48ef5b0ae9365c330 Mon Sep 17 00:00:00 2001
+From cd06372f06730c2c07d82ad42a30f6e5dcbd7e6e 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 05/22] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 06/31] Do not pass -g to GCC when not Py_DEBUG
 
 This bloats our exe and our modules a lot.
 ---
@@ -10,7 +10,7 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 96dcd0d..917ec25 100755
+index 96dcd0dcd5..917ec25dcc 100755
 --- a/configure
 +++ b/configure
 @@ -4235,9 +4235,9 @@ if test "$ac_test_CFLAGS" = set; then
@@ -35,7 +35,7 @@ index 96dcd0d..917ec25 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 18a0446..f37c6a4 100644
+index 18a044629a..f37c6a4256 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1538,7 +1538,7 @@ then
@@ -48,5 +48,5 @@ index 18a0446..f37c6a4 100644
  	    ;;
  	*)
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0006-Support-cross-compiling-byte-code.patch → recipe/patches/0007-Support-cross-compiling-byte-code.patch

@@ -1,7 +1,7 @@
-From aaf58893a6fc09793fd37e47181975c9c8c988d5 Mon Sep 17 00:00:00 2001
+From 4c5f7ff7abb6444b77ea29631f272bd1b08844fd Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 12:17:33 +0100
-Subject: [PATCH 06/22] Support cross-compiling byte-code
+Subject: [PATCH 07/31] Support cross-compiling byte-code
 
 https://bugs.python.org/issue22724
 ---
@@ -11,7 +11,7 @@ https://bugs.python.org/issue22724
  3 files changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a914a9c..1802362 100644
+index a914a9c70f..18023625df 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -245,6 +245,7 @@ BUILDPYTHON=	python$(BUILDEXE)
@@ -77,7 +77,7 @@ index a914a9c..1802362 100644
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
 diff --git a/configure b/configure
-index 917ec25..f3979f1 100755
+index 917ec25dcc..f3979f16be 100755
 --- a/configure
 +++ b/configure
 @@ -749,6 +749,7 @@ CONFIG_ARGS
@@ -99,7 +99,7 @@ index 917ec25..f3979f1 100755
  elif test "$cross_compiling" = maybe; then
      as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
 diff --git a/configure.ac b/configure.ac
-index f37c6a4..7c68866 100644
+index f37c6a4256..7c688668c1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -75,13 +75,15 @@ if test "$cross_compiling" = yes; then
@@ -120,5 +120,5 @@ index f37c6a4..7c68866 100644
 
  dnl Ensure that if prefix is specified, it does not end in a slash. If
 -- 
-2.20.1
+2.28.0
 

recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch → recipe/patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch

@@ -1,7 +1,7 @@
-From 7196edaa2dd25f3256b6b1bafc041079801006fc Mon Sep 17 00:00:00 2001
+From 5d956db96ff04c56b6d4d9f7f1f70fbb087b8c95 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 12:23:02 +0100
-Subject: [PATCH 07/22] Win32: Fixes for Windows GCC interop needed by RPy2 and
+Subject: [PATCH 08/31] Win32: Fixes for Windows GCC interop needed by RPy2 and
  CVXOPT
 
 We must pass -DMS_WIN32 or -DMS_WIN64
@@ -10,7 +10,7 @@ We must pass -DMS_WIN32 or -DMS_WIN64
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 48013e1..339c278 100644
+index 48013e1000..339c2782f0 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -302,9 +302,13 @@ class Mingw32CCompiler(CygwinCCompiler):
@@ -31,5 +31,5 @@ index 48013e1..339c278 100644
                               linker_so='%s %s %s'
                                          % (self.linker_dll, shared_option,
 -- 
-2.20.1
+2.28.0