From 25a98064c816784a834ff685c0d950c7c6442718 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sat, 2 Nov 2024 01:12:39 +0800 Subject: [PATCH 1/2] python-freethreading: fix conflict with `python@3.13` on Linux This doesn't conflict with `python@3.13` on macOS, but I overlooked some files on Linux. See discussion at #196341. --- Formula/p/python-freethreading.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Formula/p/python-freethreading.rb b/Formula/p/python-freethreading.rb index a323555da585..fabf90d2f4ce 100644 --- a/Formula/p/python-freethreading.rb +++ b/Formula/p/python-freethreading.rb @@ -29,6 +29,8 @@ class PythonFreethreading < Formula depends_on "sqlite" depends_on "xz" + # not actually used, we just want this installed to ensure there are no conflicts. + uses_from_macos "python" => :test uses_from_macos "bzip2" uses_from_macos "expat" uses_from_macos "libedit" @@ -279,8 +281,10 @@ def install mv bin/"idle#{version.major_minor}", bin/"idle#{version.major_minor}t" mv bin/"pydoc#{version.major_minor}", bin/"pydoc#{version.major_minor}t" - # Remove python3.13 named executables - (bin.children - bin.glob("*#{version.major_minor}t*")).map(&:unlink) + # Remove files that conflict with the main python3 formula + [bin, lib, lib/"pkgconfig", include].each do |directory| + (directory.glob("*python*") - directory.glob("*#{version.major_minor}t*")).map(&:unlink) + end rm_r share end From d4618c82f8147dd825f1cdc9e9117a1b54e234b9 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:01:52 +0000 Subject: [PATCH 2/2] python-freethreading: update 3.13.0 bottle. --- Formula/p/python-freethreading.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Formula/p/python-freethreading.rb b/Formula/p/python-freethreading.rb index fabf90d2f4ce..3e55e52701d9 100644 --- a/Formula/p/python-freethreading.rb +++ b/Formula/p/python-freethreading.rb @@ -11,12 +11,13 @@ class PythonFreethreading < Formula end bottle do - sha256 arm64_sequoia: "0f9eacb0bec71b324566294066d636a6751cad6ec1ea493c2190561335b40cdd" - sha256 arm64_sonoma: "cb8a80b3a41c4009d517824be20caa6eb9e271094dfff34c61c5a486d3d03c91" - sha256 arm64_ventura: "d484dfb4fa51152a1aa9fc5984737e2626b6d29855be58bfc553d75a3e29e001" - sha256 sonoma: "af65642e4704fda3fde02840c5ec241277d027fd86792ac77731797a439fba76" - sha256 ventura: "1900e44a812afbf9fdd70d5f3f27b4653e6348d4d7df729caef07eecf17841d9" - sha256 x86_64_linux: "1ae107bce7c691a26d1718752790269ff290dd07f2626b99c2556305de72c57b" + rebuild 1 + sha256 arm64_sequoia: "98c43c254a600fcb8c1701369bc501db0fa4df72a2ad20d7e22cdc55e085fc2d" + sha256 arm64_sonoma: "f43cbd1d65a4dee79c5b040903c3755372d408073181d01cee47a52f453774b5" + sha256 arm64_ventura: "5e1dfec49650c6c31cad7e38e2a198282b2f928494952db25ed47b016bc8c8ed" + sha256 sonoma: "faaeaaf1ae388ae484ad3fba8cb7a2595954605511f9b505efc4b8baf2d93a00" + sha256 ventura: "74c1f457660802b6f76250908167f448d6c951c6ccce345778cb92d69b5c55f3" + sha256 x86_64_linux: "7edd046e94be530008b8aa7cf8af55772ec95eb31f2e00fbfd079c758c9b7bf5" end # setuptools remembers the build flags python is built with and uses them to