Skip to content

Commit

Permalink
Merge pull request #7959 from Bo98/python3.7
Browse files Browse the repository at this point in the history
language/python: allow python@3.7 to be used for virtualenvs
  • Loading branch information
Bo98 committed Jul 9, 2020
2 parents a3c89ff + 1c73393 commit 04370d4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Library/Homebrew/exceptions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,18 @@ def message
end
end

class FormulaUnknownPythonError < RuntimeError
def initialize(formula)
super <<~EOS
The version of Python to use with the virtualenv in the `#{formula.full_name}` formula
cannot be guessed automatically because a recognised Python dependency could not be found.
If you are using a non-standard Python depedency, please add `:using => "python@x.y"` to
`virtualenv_install_with_resources` to resolve the issue manually.
EOS
end
end

class FormulaAmbiguousPythonError < RuntimeError
def initialize(formula)
super <<~EOS
Expand Down
3 changes: 2 additions & 1 deletion Library/Homebrew/language/python.rb
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@ def needs_python?(python)
def virtualenv_install_with_resources(options = {})
python = options[:using]
if python.nil?
pythons = %w[python python3 python@3 python@3.8 pypy pypy3]
pythons = %w[python python3 python@3 python@3.7 python@3.8 pypy pypy3]
wanted = pythons.select { |py| needs_python?(py) }
raise FormulaUnknownPythonError, self if wanted.empty?
raise FormulaAmbiguousPythonError, self if wanted.size > 1

python = wanted.first
Expand Down

0 comments on commit 04370d4

Please sign in to comment.