language/python: handle python@* in virtualenv_install_with_resources
This commit is contained in:
parent
176ed97d42
commit
5496a04dd9
@ -134,11 +134,11 @@ module Language
|
|||||||
def virtualenv_install_with_resources(options = {})
|
def virtualenv_install_with_resources(options = {})
|
||||||
python = options[:using]
|
python = options[:using]
|
||||||
if python.nil?
|
if python.nil?
|
||||||
wanted = %w[python python3].select { |py| needs_python?(py) }
|
wanted = %w[python python@2 python@3 python3].select { |py| needs_python?(py) }
|
||||||
raise FormulaAmbiguousPythonError, self if wanted.size > 1
|
raise FormulaAmbiguousPythonError, self if wanted.size > 1
|
||||||
python = wanted.first || "python"
|
python = wanted.first || "python2.7"
|
||||||
end
|
end
|
||||||
venv = virtualenv_create(libexec, python)
|
venv = virtualenv_create(libexec, python.delete("@"))
|
||||||
venv.pip_install resources
|
venv.pip_install resources
|
||||||
venv.pip_install_and_link buildpath
|
venv.pip_install_and_link buildpath
|
||||||
venv
|
venv
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user