Commit5e02477

authored and

committed

[COOK-3719] Allow alternative install python and update pip location

Signed-off-by: Seth Vargo <sethvargo@gmail.com>

1 parentf932b36 commit5e02477Copy full SHA for 5e02477

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,15 @@`
`31`	`31`	`default['python']['prefix_dir']='/usr/local'`
`32`	`32`	`end`
`33`	`33`
`34`		`-default['python']['binary']="#{python['prefix_dir']}/bin/python"`
	`34`	`+default['python']['binary']="#{node['python']['prefix_dir']}/bin/python"`
`35`	`35`
`36`	`36`	`default['python']['url']='http://www.python.org/ftp/python'`
`37`	`37`	`default['python']['version']='2.7.5'`
`38`	`38`	`default['python']['checksum']='3b477554864e616a041ee4d7cef9849751770bc7c39adaf78a94ea145c488059'`
`39`	`39`	`default['python']['configure_options']=%W{--prefix=#{python['prefix_dir']}}`
	`40`	`+default['python']['make_options']=%W{install}`
`40`	`41`
`41`	`42`	`default['python']['setuptools_script_url']='https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py'`
`42`	`43`	`default['python']['pip_script_url']='https://raw.github.com/pypa/pip/master/contrib/get-pip.py'`
	`44`	`+default['python']['pip_location']="#{node['python']['prefix_dir']}/bin/pip"`
	`45`	`+default['python']['virtualenv_location']="#{node['python']['prefix_dir']}/bin/virtualenv"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,8 @@ def pip_cmd(subcommand, version='')`
`160`	`160`	`defwhich_pip(nr)`
`161`	`161`	`if(nr.respond_to?("virtualenv") &&nr.virtualenv)`
`162`	`162`	`::File.join(nr.virtualenv,'/bin/pip')`
`163`		`-elsifnode['python']['install_method'].eql?("source")`
`164`		`-::File.join(node['python']['prefix_dir'],"/bin/pip")`
	`163`	`+elsif::File.exists?(node['python']['pip_location'])`
	`164`	`+node['python']['pip_location']`
`165`	`165`	`else`
`166`	`166`	`'pip'`
`167`	`167`	`end`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ def load_current_resource`
`61`	`61`	`end`
`62`	`62`
`63`	`63`	`defvirtualenv_cmd()`
`64`		`-ifnode['python']['install_method'].eql?("source")`
`65`		`-::File.join(node['python']['prefix_dir'],"/bin/virtualenv")`
	`64`	`+if::File.exists?(node['python']['virtualenv_location'])`
	`65`	`+node['python']['virtualenv_location']`
`66`	`66`	`else`
`67`	`67`	`"virtualenv"`
`68`	`68`	`end`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`include_recipe"build-essential"`
`22`	`22`
`23`	`23`	`configure_options=node['python']['configure_options'].join(" ")`
	`24`	`+make_options=node['python']['make_options'].join(" ")`
`24`	`25`
`25`	`26`	`packages=value_for_platform_family(`
`26`	`27`	`"rhel"=>["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"],`
`@@ -46,7 +47,7 @@`
`46`	`47`	`code<<-EOF`
`47`	`48`	`tar -jxvf Python-#{version}.tar.bz2`
`48`	`49`	`(cd Python-#{version} && ./configure#{configure_options})`
`49`		`- (cd Python-#{version} && make && makeinstall)`
	`50`	`+ (cd Python-#{version} && make && make#{make_options})`
`50`	`51`	`EOF`
`51`	`52`	`environment({`
`52`	`53`	`"LDFLAGS"=>"-L#{node['python']['prefix_dir']} -L/usr/lib",`

Comments

(0)