Merge pull request #3848 from ilovezfs/python-teach-each-python-to-speak-@

language/python: handle python@* in each_python
This commit is contained in:
ilovezfs 2018-02-28 05:43:47 -08:00 committed by GitHub
commit 8a23df7f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,10 +15,11 @@ module Language
def self.each_python(build, &block) def self.each_python(build, &block)
original_pythonpath = ENV["PYTHONPATH"] original_pythonpath = ENV["PYTHONPATH"]
["python", "python3"].each do |python| { "python@3" => "python3", "python@2" => "python2.7" }.each do |python_formula, python|
next if build.without? python python_formula = Formulary.factory(python_formula)
next if build.without? python_formula.to_s
version = major_minor_version python version = major_minor_version python
ENV["PYTHONPATH"] = if Formulary.factory(python).installed? ENV["PYTHONPATH"] = if python_formula.installed?
nil nil
else else
homebrew_site_packages(version) homebrew_site_packages(version)