diff --git a/attributes/default.rb b/attributes/default.rb index 699df21..65a8318 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -41,5 +41,5 @@ default['python']['pip_location'] = "#{node['python']['prefix_dir']}/bin/pip" default['python']['virtualenv_location'] = "#{node['python']['prefix_dir']}/bin/virtualenv" -default['python']['setuptools_version'] = nil # defaults to latest -default['python']['virtualenv_version'] = nil +default['python']['setuptools_version'] = "44.0.0" +default['python']['virtualenv_version'] = "16.7.9" diff --git a/recipes/pip.rb b/recipes/pip.rb index ad02ab7..3ea5fb4 100644 --- a/recipes/pip.rb +++ b/recipes/pip.rb @@ -23,29 +23,7 @@ # redhat/package: /usr/bin/pip (sha a8a3a3) # omnibus/source: /opt/local/bin/pip (sha 29ce9874) -if node['python']['install_method'] == 'source' - pip_binary = "#{node['python']['prefix_dir']}/bin/pip" -elsif platform_family?("rhel", "fedora") - pip_binary = "/usr/bin/pip" -elsif platform_family?("smartos") - pip_binary = "/opt/local/bin/pip" -else - pip_binary = "/usr/local/bin/pip" -end - -cookbook_file "#{Chef::Config[:file_cache_path]}/get-pip.py" do - source 'get-pip.py' - mode "0644" - not_if { ::File.exists?(pip_binary) } -end - -execute "install-pip" do - cwd Chef::Config[:file_cache_path] - command <<-EOF - #{node['python']['binary']} get-pip.py - EOF - not_if { ::File.exists?(pip_binary) } -end +package 'python-pip' python_pip 'setuptools' do action :upgrade diff --git a/recipes/virtualenv.rb b/recipes/virtualenv.rb index e0626a4..d2a6775 100644 --- a/recipes/virtualenv.rb +++ b/recipes/virtualenv.rb @@ -21,6 +21,6 @@ include_recipe "python::pip" python_pip "virtualenv" do - action :upgrade + action :install version node['python']['virtualenv_version'] end