Skip to content

Commit db114d9

Browse files
3.13.0 (#731)
automerged PR by conda-forge/automerge-action
2 parents b617ad4 + 32f73c3 commit db114d9

27 files changed

Lines changed: 58 additions & 38 deletions

recipe/build_base.sh

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,5 +546,24 @@ if [[ "$target_platform" == linux-* ]]; then
546546
rm ${PREFIX}/include/uuid.h
547547
fi
548548

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

recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set version = "3.13.0" %}
2-
{% set dev = "rc3" %}
2+
{% set dev = "" %}
33
{% set dev_ = "" %}
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
55
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -38,7 +38,7 @@ package:
3838
source:
3939
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
4040
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
41-
md5: 2962a5d4ddb85a4fabc7fc9d726f76fa
41+
md5: 726e5b829fcf352326874c1ae599abaa
4242
patches:
4343
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
4444
- patches/0002-Win32-Do-not-download-externals.patch

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c9901a12102f3f9e7d935246cff778acf6173b64 Mon Sep 17 00:00:00 2001
1+
From ab2a0ef0f9757900f002ae5cfb2732da07cdb730 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Wed, 16 Aug 2017 11:53:55 +0100
44
Subject: [PATCH 01/23] Win32: Change FD_SETSIZE from 512 to 2048

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 576825190fa0ba2f79082dc169db4f848f9f5522 Mon Sep 17 00:00:00 2001
1+
From fbe15c02d7edea0de89e2c4ef2ccb2f14582a515 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Thu, 7 Sep 2017 11:35:47 +0100
44
Subject: [PATCH 02/23] Win32: Do not download externals

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 34fc7767b7e1853fd6918895b9e815cfe3185045 Mon Sep 17 00:00:00 2001
1+
From cc490a55e74e511957be1fb3b2468cc5d1d1162b Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 5 Dec 2017 22:47:59 +0000
44
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 71a937431526f656cbbd61fe3a93259b42cf41d0 Mon Sep 17 00:00:00 2001
1+
From 418e53e98a25cbc629afcfb0b441c218ea1ef51e Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Sat, 27 Oct 2018 18:48:30 +0100
44
Subject: [PATCH 04/23] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS

recipe/patches/0005-Unvendor-openssl.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5db18ef4700c2ccb38b22304fdf3b3f49ddc9742 Mon Sep 17 00:00:00 2001
1+
From 71bf198e09615b89d2bd8367839b0ea8329de93c Mon Sep 17 00:00:00 2001
22
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
33
Date: Sat, 24 Nov 2018 20:38:02 -0600
44
Subject: [PATCH 05/23] Unvendor openssl

recipe/patches/0006-Unvendor-sqlite3.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8c8f84b74311ad8555090419db43fbc73012220f Mon Sep 17 00:00:00 2001
1+
From 26efebf5c402db2622e2baf998fa5ef854eefc98 Mon Sep 17 00:00:00 2001
22
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
33
Date: Tue, 5 Oct 2021 12:42:06 -0700
44
Subject: [PATCH 06/23] Unvendor sqlite3

recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7f6c5a40be88d1c9c2bed791988925f4e2368e9a Mon Sep 17 00:00:00 2001
1+
From 40f67f167b72114fefda0b783b2d22e6ca439ecf Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 24 Dec 2019 18:37:17 +0100
44
Subject: [PATCH 07/23] Add CondaEcosystemModifyDllSearchPath()

recipe/patches/0008-Doing-d1trimfile.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6aa8cdebfd6c851af34a37c39cd4b85cd94998c9 Mon Sep 17 00:00:00 2001
1+
From 6040773fedb0a28fd98a5a06bdf70886999b89e7 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Tue, 31 Dec 2019 21:47:47 +0100
44
Subject: [PATCH 08/23] Doing d1trimfile

0 commit comments

Comments
 (0)