From 57c136e848223e263ec6626e2065ba4094962f97 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Tue, 15 Sep 2020 22:41:15 +0200 Subject: [PATCH 1/2] python.rb: prepare for Python 3.9 --- 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 cd9fa6db91..f761d2e635 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -177,7 +177,7 @@ module Language def virtualenv_install_with_resources(options = {}) python = options[:using] if python.nil? - pythons = %w[python python3 python@3 python@3.7 python@3.8 pypy pypy3] + pythons = %w[python python3 python@3 python@3.7 python@3.8 python@3.9 pypy pypy3] wanted = pythons.select { |py| needs_python?(py) } raise FormulaUnknownPythonError, self if wanted.empty? raise FormulaAmbiguousPythonError, self if wanted.size > 1 From f04b0142102a872d255440aef75984c1b213c584 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 16 Sep 2020 12:47:20 +0100 Subject: [PATCH 2/2] language/python: build python binary names dynamically. Co-authored-by: Alexander Bayandin --- 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 f761d2e635..fbfd82b3d0 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -177,7 +177,7 @@ module Language def virtualenv_install_with_resources(options = {}) python = options[:using] if python.nil? - pythons = %w[python python3 python@3 python@3.7 python@3.8 python@3.9 pypy pypy3] + pythons = %w[python python3 pypy pypy3] + Formula.names.select { |name| name.start_with? "python@" } wanted = pythons.select { |py| needs_python?(py) } raise FormulaUnknownPythonError, self if wanted.empty? raise FormulaAmbiguousPythonError, self if wanted.size > 1