3.13.0 (#731)

automerged PR by conda-forge/automerge-action

recipe/build_base.sh

@@ -546,5 +546,24 @@ if [[ "$target_platform" == linux-* ]]; then
   rm ${PREFIX}/include/uuid.h
 fi
 
-# See ${RECIPE_DIR}/sitecustomize.py
-cp "${RECIPE_DIR}/sitecustomize.py" "${PREFIX}/lib/python${VERABI_NO_DBG}/sitecustomize.py"
+# Workaround for https://github.com/conda/conda/issues/14053
+# Older conda versions install noarch: python packages in wrong places.
+# For example python3.1 because older conda assumed python minor version
+# will have only one digit. noarhc pkgs for freethreading builds are supposed
+# to be installed into <prefix>/lib/python3.13t/site-packages, but conda
+# installs them to <prefix>/lib/python3.13/site-packages.
+# The workaround is to add all these wrong paths to sys.path using
+# a pth file so that cpython and other tools like pip know about these
+# locations to check when importing packages and uninstalling packages.
+# When installing packages, pip will use the correct location
+# <prefix>/lib/python3.13t/site-packages.
+# Note that these directories are not added to sys.path if they do not exist.
+SP_DIR="${PREFIX}/lib/python${PY_VER}${THREAD}/site-packages"
+if [[ ${PY_FREETHREADING} == yes ]]; then
+    echo "${PREFIX}/lib/python${PY_VER}/site-packages" >> $SP_DIR/conda-site.pth
+fi
+# Workaround for https://github.com/conda/conda/issues/10969
+echo "${PREFIX}/lib/python3.1/site-packages" >> $SP_DIR/conda-site.pth
+# A python version independent directory that ABI3 and noarch packages can use.
+# This is unused at the moment, but keeping it here for experimentation.
+echo "${PREFIX}/lib/python/site-packages" >> $SP_DIR/conda-site.pth

recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set version = "3.13.0" %}
-{% set dev = "rc3" %}
+{% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -38,7 +38,7 @@ package:
 source:
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
-    md5: 2962a5d4ddb85a4fabc7fc9d726f76fa
+    md5: 726e5b829fcf352326874c1ae599abaa
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
       - patches/0002-Win32-Do-not-download-externals.patch

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,4 +1,4 @@
-From c9901a12102f3f9e7d935246cff778acf6173b64 Mon Sep 17 00:00:00 2001
+From ab2a0ef0f9757900f002ae5cfb2732da07cdb730 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/23] Win32: Change FD_SETSIZE from 512 to 2048

recipe/patches/0002-Win32-Do-not-download-externals.patch

@@ -1,4 +1,4 @@
-From 576825190fa0ba2f79082dc169db4f848f9f5522 Mon Sep 17 00:00:00 2001
+From fbe15c02d7edea0de89e2c4ef2ccb2f14582a515 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/23] Win32: Do not download externals

recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch

@@ -1,4 +1,4 @@
-From 34fc7767b7e1853fd6918895b9e815cfe3185045 Mon Sep 17 00:00:00 2001
+From cc490a55e74e511957be1fb3b2468cc5d1d1162b 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/23] Fix find_library so that it looks in sys.prefix/lib

recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch

@@ -1,4 +1,4 @@
-From 71a937431526f656cbbd61fe3a93259b42cf41d0 Mon Sep 17 00:00:00 2001
+From 418e53e98a25cbc629afcfb0b441c218ea1ef51e 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/23] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS

recipe/patches/0005-Unvendor-openssl.patch

@@ -1,4 +1,4 @@
-From 5db18ef4700c2ccb38b22304fdf3b3f49ddc9742 Mon Sep 17 00:00:00 2001
+From 71bf198e09615b89d2bd8367839b0ea8329de93c 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/23] Unvendor openssl

recipe/patches/0006-Unvendor-sqlite3.patch

@@ -1,4 +1,4 @@
-From 8c8f84b74311ad8555090419db43fbc73012220f Mon Sep 17 00:00:00 2001
+From 26efebf5c402db2622e2baf998fa5ef854eefc98 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/23] Unvendor sqlite3

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,4 +1,4 @@
-From 7f6c5a40be88d1c9c2bed791988925f4e2368e9a Mon Sep 17 00:00:00 2001
+From 40f67f167b72114fefda0b783b2d22e6ca439ecf 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/23] Add CondaEcosystemModifyDllSearchPath()

recipe/patches/0008-Doing-d1trimfile.patch

@@ -1,4 +1,4 @@
-From 6aa8cdebfd6c851af34a37c39cd4b85cd94998c9 Mon Sep 17 00:00:00 2001
+From 6040773fedb0a28fd98a5a06bdf70886999b89e7 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/23] Doing d1trimfile

recipe/patches/0009-cross-compile-darwin.patch

@@ -1,4 +1,4 @@
-From 7f3dca2b5ec07180b3e3261ee5ebdea9322425dc Mon Sep 17 00:00:00 2001
+From 63a8b3e83c26cd82544076565db9c97ce7d0fa9d 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/23] cross compile darwin
@@ -29,7 +29,7 @@ index 5958382276e..44264f0c812 100755
      try:
          import plistlib
 diff --git a/configure b/configure
-index 7e1e5e594ca..e11421617e6 100755
+index 7cdd386c387..a75a8f825fe 100755
 --- a/configure
 +++ b/configure
 @@ -4048,6 +4048,9 @@ then
@@ -53,7 +53,7 @@ index 7e1e5e594ca..e11421617e6 100755
  		_host_ident=
  		;;
 diff --git a/configure.ac b/configure.ac
-index 58f54076ff2..1d51b1ac8e1 100644
+index 24e28a1e2de..3772d105fb2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -324,6 +324,9 @@ then

recipe/patches/0010-Fix-TZPATH-on-windows.patch

@@ -1,4 +1,4 @@
-From 1d8b4e4a4be72fee133fc23b3f86ac39fca9c4ad Mon Sep 17 00:00:00 2001
+From 9832cf5b672b9727b8dd53f5bc3102b5392b47eb 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/23] Fix TZPATH on windows

recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch

@@ -1,4 +1,4 @@
-From 39fdde0bc53252579ecdefdb1c1619367ffb1e60 Mon Sep 17 00:00:00 2001
+From 36eff8fef320b46a7ba58eadc7f5373ba2fd1660 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/23] Make dyld search work with SYSTEM_VERSION_COMPAT=1

recipe/patches/0012-Unvendor-bzip2.patch

@@ -1,4 +1,4 @@
-From 5ce98799c4f819327adf53638097bc9e32a6d873 Mon Sep 17 00:00:00 2001
+From 7a330247c92583afa0a497cb99d0d4b899999544 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/23] Unvendor bzip2

recipe/patches/0013-Unvendor-libffi.patch

@@ -1,4 +1,4 @@
-From 6c70a788ae4e143e733be3b4fb8c493c761335f6 Mon Sep 17 00:00:00 2001
+From eca87c80f78182f5fdb1a1ae520ede412545eb8b 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/23] Unvendor libffi

recipe/patches/0014-Unvendor-tcltk.patch

@@ -1,4 +1,4 @@
-From e7bf1351be8e6f09b21a74af9038e34423c14ed8 Mon Sep 17 00:00:00 2001
+From 5daa08d74f165cad5c86a6a8cfdb5c1c00c9a544 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/23] Unvendor tcltk

recipe/patches/0015-unvendor-xz.patch

@@ -1,4 +1,4 @@
-From 4d05c339525594b1a0a13c945098b52a232404b8 Mon Sep 17 00:00:00 2001
+From afab00e7f9e99c1e438c407c7b3f6eaa78886d5a 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/23] unvendor xz

recipe/patches/0016-unvendor-zlib.patch

@@ -1,4 +1,4 @@
-From 57e21846907da306162035f2794f80784e5b7641 Mon Sep 17 00:00:00 2001
+From e40b831fd07ec6a12d661c829dd5615bd1e4729f 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/23] unvendor zlib

recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch

@@ -1,4 +1,4 @@
-From 898d5f0d69365f24b1acea3497f1c9c357d8f03a Mon Sep 17 00:00:00 2001
+From 17f3753e62d6defc46c73f405878c3d7abd25896 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/23] Do not pass -g to GCC when not Py_DEBUG
@@ -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 e11421617e6..f59a447bc29 100755
+index a75a8f825fe..dbe946b1e8c 100755
 --- a/configure
 +++ b/configure
 @@ -5667,9 +5667,9 @@ if test $ac_test_CFLAGS; then
@@ -25,7 +25,7 @@ index e11421617e6..f59a447bc29 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -9501,7 +9501,7 @@ then
+@@ -9505,7 +9505,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -35,10 +35,10 @@ index e11421617e6..f59a447bc29 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 1d51b1ac8e1..4ea227c40a4 100644
+index 3772d105fb2..50188f25e59 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2361,7 +2361,7 @@ then
+@@ -2365,7 +2365,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else

recipe/patches/0018-Unvendor-expat.patch

@@ -1,4 +1,4 @@
-From d9012e34d2377c7af94c515c5b331377f12a25a3 Mon Sep 17 00:00:00 2001
+From 00b77e387f567a97250cedbf054f1f64a1f54f51 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Mar 2023 23:07:10 -0500
 Subject: [PATCH 18/23] Unvendor expat

recipe/patches/0019-Remove-unused-readelf.patch

@@ -1,4 +1,4 @@
-From a753f3235aa70f70b63c2cb725c8ead2d24091b6 Mon Sep 17 00:00:00 2001
+From aa8ba18bb2b72744bc245c2afb8aa4519cae5c19 Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Thu, 25 May 2023 17:56:53 -0400
 Subject: [PATCH 19/23] Remove unused readelf
@@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``.
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f9932ddab9d..03ea3cadcff 100644
+index 538229220fd..a2c954d9609 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,7 +38,6 @@ CC=		@CC@

recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch

@@ -1,4 +1,4 @@
-From a52cd2d934f05d38bdd33b1b608868bb9c0e374d Mon Sep 17 00:00:00 2001
+From 534eb93832b4a219bb2b4b940989c3e3809be802 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 1 Sep 2023 23:32:14 +0200
 Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling
@@ -10,7 +10,7 @@ Subject: [PATCH 20/23] Don't checksharedmods if cross-compiling
  create mode 100755 if_runnable.sh
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 03ea3cadcff..9d2ad1889e0 100644
+index a2c954d9609..53e7a24127a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1367,7 +1367,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt

recipe/patches/0021-Override-configure-LIBFFI.patch

@@ -1,4 +1,4 @@
-From 3602cfe1f32e939c04fc13c02eda493b1e562455 Mon Sep 17 00:00:00 2001
+From 36d02ddc0beda1b2a326a3559715cc90ca7f1836 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 5 Sep 2023 21:51:31 +0200
 Subject: [PATCH 21/23] Override configure LIBFFI
@@ -8,10 +8,10 @@ Subject: [PATCH 21/23] Override configure LIBFFI
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index f59a447bc29..e2b8dac1d18 100755
+index dbe946b1e8c..514960f5672 100755
 --- a/configure
 +++ b/configure
-@@ -14269,7 +14269,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
+@@ -14273,7 +14273,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
  then :
 
                  have_libffi=yes

recipe/patches/0022-Unvendor-libmpdec.patch

@@ -1,4 +1,4 @@
-From 3dd786488c6f7d95ba38c09c128364980191f1b9 Mon Sep 17 00:00:00 2001
+From ec5a566e422edc48789bc49bb998263f77253587 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 16 Aug 2024 21:34:43 -0500
 Subject: [PATCH 22/23] Unvendor libmpdec

recipe/patches/0023-Brand-conda-forge.patch

@@ -1,4 +1,4 @@
-From 3a8565ff0e1340b1f0e771c4c813e836beb9f5be Mon Sep 17 00:00:00 2001
+From 58b2f9aad3ae81f188d973a0511faffcaae5ee77 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 28 Aug 2024 11:12:22 -0500
 Subject: [PATCH 23/23] Brand conda-forge

recipe/patches/README.md

@@ -14,6 +14,7 @@ git format-patch --no-signature $new
 for f in *.patch; do
   python ../recipe/patches/make-mixed-crlf-patch.py $f;
 done
+cp 00*.patch ../recipe/patches/
 ```
 
 On windows, the last loop can be done as follows (once the patches

recipe/patches/make-mixed-crlf-patch.py

@@ -42,7 +42,7 @@ def main(argv):
                         line.startswith('+++ ') or \
                         line.startswith('@@ ') or \
                         line.startswith('index ') or \
-                        (i < len(lines) - 1 and lines[i+1].startswith("\ No newline at end of file")):
+                        (i < len(lines) - 1 and lines[i+1].startswith(r"\ No newline at end of file")):
                     fo.write((line + '\n').encode('utf-8'))
                 else:
                     fo.write((line + '\r\n').encode('utf-8'))