From 5593a5cab986bdc0f8ec6dfd6b6e961f8385c111 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Tue, 20 May 2025 23:08:13 -0400 Subject: [PATCH 1/7] utils/pypi: ensure pure Python wheels support py3 --- Library/Homebrew/utils/pypi.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index a0d99f3fc9..831c07ea39 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -82,10 +82,10 @@ module PyPI url["packagetype"] == "sdist" end - # If there isn't an sdist, we use the first universal wheel. + # If there isn't an sdist, we use the first pure Python3 or universal wheel if dist.nil? dist = json["urls"].find do |url| - url["filename"].end_with?("-none-any.whl") + url["filename"].end_with?("py3-none-any.whl") end end From 073903958f891a6ceee95d07e4f22fbc55ad6a89 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Sat, 31 May 2025 21:12:27 -0400 Subject: [PATCH 2/7] utils/pypi: update pure Python wheel detection --- Library/Homebrew/utils/pypi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 831c07ea39..60e929a94a 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -85,7 +85,7 @@ module PyPI # If there isn't an sdist, we use the first pure Python3 or universal wheel if dist.nil? dist = json["urls"].find do |url| - url["filename"].end_with?("py3-none-any.whl") + url["filename"].match?("py3.*-none-any.whl$") end end From f0bfe8971669b470d128ca83fa41f64cd886b976 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Sat, 31 May 2025 21:14:09 -0400 Subject: [PATCH 3/7] language/python: update pure Python wheel detection --- Library/Homebrew/language/python.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index e3c279e6f5..b87274c206 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -399,7 +399,7 @@ module Language if t.is_a?(Resource) t.stage do target = Pathname.pwd - target /= t.downloader.basename if t.url&.end_with?("-none-any.whl") + target /= t.downloader.basename if t.url&.match?("py3.*-none-any.whl$") do_install(target, build_isolation:) end else From e8f4a8e1a783c8814d825beefe9f396faeabdd36 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Tue, 10 Jun 2025 00:49:11 -0400 Subject: [PATCH 4/7] utils/pypi: further update pure Python wheel detection --- Library/Homebrew/utils/pypi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 60e929a94a..30bb3b30b8 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -85,7 +85,7 @@ module PyPI # If there isn't an sdist, we use the first pure Python3 or universal wheel if dist.nil? dist = json["urls"].find do |url| - url["filename"].match?("py3.*-none-any.whl$") + url["filename"].match?("[.-]py3[^-]*-none-any\.whl$") end end From 5f188b830e78964c7a9ca5161752c6626720d4ca Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Tue, 10 Jun 2025 00:49:39 -0400 Subject: [PATCH 5/7] languate/python: further update pure Python wheel detection --- Library/Homebrew/language/python.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index b87274c206..3257baf533 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -399,7 +399,7 @@ module Language if t.is_a?(Resource) t.stage do target = Pathname.pwd - target /= t.downloader.basename if t.url&.match?("py3.*-none-any.whl$") + target /= t.downloader.basename if t.url&.match?("[.-]py3[^-]*-none-any\.whl$") do_install(target, build_isolation:) end else From 3578b8405303a33bf622dfcf5f01ab800831245e Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Tue, 10 Jun 2025 00:59:28 -0400 Subject: [PATCH 6/7] utils/pypi: fix style issue --- Library/Homebrew/utils/pypi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/pypi.rb b/Library/Homebrew/utils/pypi.rb index 30bb3b30b8..cb3279ad6d 100644 --- a/Library/Homebrew/utils/pypi.rb +++ b/Library/Homebrew/utils/pypi.rb @@ -85,7 +85,7 @@ module PyPI # If there isn't an sdist, we use the first pure Python3 or universal wheel if dist.nil? dist = json["urls"].find do |url| - url["filename"].match?("[.-]py3[^-]*-none-any\.whl$") + url["filename"].match?("[.-]py3[^-]*-none-any.whl$") end end From 142d2f4df9d9387032f6a49b7cfd976d48eb71ac Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Tue, 10 Jun 2025 00:59:44 -0400 Subject: [PATCH 7/7] language/python: fix style issue --- Library/Homebrew/language/python.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index 3257baf533..5f26844d6f 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -399,7 +399,7 @@ module Language if t.is_a?(Resource) t.stage do target = Pathname.pwd - target /= t.downloader.basename if t.url&.match?("[.-]py3[^-]*-none-any\.whl$") + target /= t.downloader.basename if t.url&.match?("[.-]py3[^-]*-none-any.whl$") do_install(target, build_isolation:) end else