admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Hotfix: Revert Python module

Browse Source
This commit is contained in:
Samuel John 2013-06-06 13:18:32 +02:00
parent 4e8aa8637f
commit 1c95045033
3 changed files with 73 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/formula.rb
View File

@ -307,7 +307,7 @@ class Formula
def python(options={:allowed_major_versions => [2, 3]}, &block) def python(options={:allowed_major_versions => [2, 3]}, &block)
require 'python_helper' require 'python_helper'
Python::python_helper(options, &block) python_helper(options, &block)
end end
# Explicitly only execute the block for 2.x (if a python 2.x is available) # Explicitly only execute the block for 2.x (if a python 2.x is available)

145
Library/Homebrew/python_helper.rb
View File

@ -1,84 +1,81 @@
# The python_helper is used in the Formula class when the user calls # This is used in the Formula class when the user calls
# `python`, `python2` or `python3`. # `python`, `python2` or `python3`.
module Python # This method has a dual nature. For one, it takes a &block and sets up
# This method has a dual nature. For one, it takes a &block and sets up # the ENV such that a Python, as defined in the requirements, is the default.
# the ENV such that a Python, as defined in the requirements, is the default. # If there are multiple `PythonInstalled` requirements, the block is evaluated
# If there are multiple `PythonInstalled` requirements, the block is evaluated # once for each Python. This makes it possible to easily support 2.x and
# once for each Python. This makes it possible to easily support 2.x and # 3.x Python bindings without code duplication in formulae.
# 3.x Python bindings without code duplication in formulae. # If you need to special case stuff, set :allowed_major_versions.
# If you need to special case stuff, set :allowed_major_versions. # Second, inside the block, a formula author may call this method to access
# Second, inside the block, a formula author may call this method to access # certain convienience methods for the currently selected Python, e.g.
# certain convienience methods for the currently selected Python, e.g. # `python.site_packages`.
# `python.site_packages`. def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
def python_helper(options={:allowed_major_versions => [2, 3]}, &block) if !block_given? and !@current_python.nil?
if !block_given? and !@current_python.nil? # We are already inside of a `python do ... end` block, so just return
# We are already inside of a `python do ... end` block, so just return # the current_python or false if the version.major is not allowed.
# the current_python or false if the version.major is not allowed. if options[:allowed_major_versions].include?(@current_python.version.major)
if options[:allowed_major_versions].include?(@current_python.version.major) @current_python
@current_python
else
false
end
else else
# Look for PythonInstalled requirements for this formula false
python_reqs = requirements.select{ |r| r.kind_of?(PythonInstalled) } end
if python_reqs.empty? else
raise "If you use python in the formula, you have to add `depends_on :python` (or :python3)!" # Look for PythonInstalled requirements for this formula
end python_reqs = requirements.select{ |r| r.kind_of?(PythonInstalled) }
# Now select those that are satisfied and matching the version.major if python_reqs.empty?
python_reqs = python_reqs.select do |p| raise "If you use python in the formula, you have to add `depends_on :python` (or :python3)!"
p.satisfied? && end
options[:allowed_major_versions].include?(p.version.major) && # Now select those that are satisfied and matching the version.major
if p.optional? || p.recommended? python_reqs = python_reqs.select do |p|
self.build.with?(p.name) p.satisfied? &&
else options[:allowed_major_versions].include?(p.version.major) &&
true if p.optional? || p.recommended?
end self.build.with?(p.name)
else
true
end end
end
# Allow to use an else-branch like so: `if python do ... end; else ... end` # Allow to use an else-branch like so: `if python do ... end; else ... end`
return false if python_reqs.empty? return false if python_reqs.empty?
# Sort by version, so the older 2.x will be used first and if no # Sort by version, so the older 2.x will be used first and if no
# block_given? then 2.x is preferred because it is returned. # block_given? then 2.x is preferred because it is returned.
# Further note, having 3.x last allows us to run `2to3 --write .` # Further note, having 3.x last allows us to run `2to3 --write .`
# which modifies the sources in-place (for some packages that need this). # which modifies the sources in-place (for some packages that need this).
python_reqs.sort_by{ |py| py.version }.map do |py| python_reqs.sort_by{ |py| py.version }.map do |py|
# Now is the time to set the site_packages to the correct value # Now is the time to set the site_packages to the correct value
py.site_packages = lib/py.xy/'site-packages' py.site_packages = lib/py.xy/'site-packages'
if !block_given? if !block_given?
return py return py
else else
puts "brew: Python block (#{py.binary})..." if ARGV.verbose? && ARGV.debug? puts "brew: Python block (#{py.binary})..." if ARGV.verbose? && ARGV.debug?
# Ensure env changes are only temporary # Ensure env changes are only temporary
begin begin
old_env = ENV.to_hash old_env = ENV.to_hash
# In order to install into the Cellar, the dir must exist and be in the # In order to install into the Cellar, the dir must exist and be in the
# PYTHONPATH. This will be executed in the context of the formula # PYTHONPATH. This will be executed in the context of the formula
# so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib # so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib
puts "brew: Appending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose? puts "brew: Appending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose?
mkdir_p py.site_packages mkdir_p py.site_packages
ENV.append 'PYTHONPATH', py.site_packages, ':' ENV.append 'PYTHONPATH', py.site_packages, ':'
ENV['PYTHON'] = py.binary ENV['PYTHON'] = py.binary
ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':' ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':'
ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path
ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx? ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx?
ENV.prepend 'LDFLAGS', "-F#{py.framework}" if py.brewed? ENV.prepend 'LDFLAGS', "-F#{py.framework}" if py.brewed?
# Track the state of the currently selected python for this block, # Track the state of the currently selected python for this block,
# so if this python_helper is called again _inside_ the block, we can # so if this python_helper is called again _inside_ the block,
# just return the right python (see `else`-branch a few lines down): # we can just return the right python (see `else`-branch a few lines down):
@current_python = py @current_python = py
res = instance_eval(&block) res = instance_eval(&block)
@current_python = nil @current_python = nil
res res
ensure ensure
ENV.replace(old_env) ENV.replace(old_env)
end
end end
end end
end end
end # enf of python_helper method end
end # enf of python_helper method
end

2
Library/Homebrew/requirements/python_dependency.rb
View File

@ -129,7 +129,7 @@ class PythonInstalled < Requirement
end end
# Homebrew's global site-packages. The local ones (just `site_packages`) are # Homebrew's global site-packages. The local ones (just `site_packages`) are
# populated by the python_helper method when the `prefix` of a formula is known. # populated by the python_helperg method when the `prefix` of a formula is known.
def global_site_packages def global_site_packages
HOMEBREW_PREFIX/"lib/#{xy}/site-packages" HOMEBREW_PREFIX/"lib/#{xy}/site-packages"
end end