aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-12-31 09:42:23 +0000
committerGitHub2017-12-31 09:42:23 +0000
commit884a2f3667f21109b569d129591199619e76dbe8 (patch)
tree30bb0745f9bcac759dd336b7f143b43df9401fe3
parent04bcf6928787030d5935354744bbddc3b14a3e14 (diff)
parent5496a04dd977b1e0d6c71ed0ff6de01e722ca513 (diff)
downloadbrew-884a2f3667f21109b569d129591199619e76dbe8.tar.bz2
Merge pull request #3618 from ilovezfs/python-teach-virtualenv-to-speak-@
language/python: handle python@* in virtualenv_install_with_resources
-rw-r--r--Library/Homebrew/language/python.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb
index b52714dd5..3908f4b8f 100644
--- a/Library/Homebrew/language/python.rb
+++ b/Library/Homebrew/language/python.rb
@@ -134,11 +134,11 @@ module Language
def virtualenv_install_with_resources(options = {})
python = options[:using]
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
- python = wanted.first || "python"
+ python = wanted.first || "python2.7"
end
- venv = virtualenv_create(libexec, python)
+ venv = virtualenv_create(libexec, python.delete("@"))
venv.pip_install resources
venv.pip_install_and_link buildpath
venv