Merge pull request #7959 from Bo98/python3.7
language/python: allow python@3.7 to be used for virtualenvs
This commit is contained in:
commit
04370d4663
@ -320,6 +320,18 @@ class FormulaConflictError < RuntimeError
|
||||
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
|
||||
|
||||
@ -180,8 +180,9 @@ module Language
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user