diff --git a/.github/workflows/ci-pr-quality.yml b/.github/workflows/ci-pr-quality.yml new file mode 100644 index 0000000..9e0f334 --- /dev/null +++ b/.github/workflows/ci-pr-quality.yml @@ -0,0 +1,10 @@ +--- +name: ci-pr-quality + +on: + pull_request: + types: [opened, reopened, edited, synchronize] + +jobs: + ci-pr-quality: + uses: Tealium/github-actions-shared/.github/workflows/ci-pr-quality.yml@main diff --git a/metadata.rb b/metadata.rb index 4a86423..f4a4c2c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer_email "noah@coderanger.net" license "Apache 2.0" description "Installs Python, pip and virtualenv. Includes LWRPs for managing Python packages with `pip` and `virtualenv` isolated Python environments." -version "1.4.7" +version "1.4.8" depends "build-essential" depends "yum-epel" @@ -12,7 +12,7 @@ recipe "python::package", "Installs python using packages." recipe "python::source", "Installs python from source." recipe "python::pip", "Installs pip from source." -recipe "python::virtualenv", "Installs virtualenv using the python_pip resource." +# recipe "python::virtualenv", "Installs virtualenv using the python_pip resource." %w{ debian ubuntu centos redhat fedora freebsd smartos }.each do |os| supports os diff --git a/recipes/default.rb b/recipes/default.rb index ee9afe8..fabca3b 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # # Author:: Seth Chisamore # Cookbook Name:: python @@ -19,5 +21,5 @@ # include_recipe "python::#{node['python']['install_method']}" -include_recipe "python::pip" -include_recipe "python::virtualenv" +include_recipe 'python::pip' +# include_recipe "python::virtualenv" diff --git a/recipes/pip.rb b/recipes/pip.rb index 17110fa..e6b1c22 100644 --- a/recipes/pip.rb +++ b/recipes/pip.rb @@ -47,7 +47,7 @@ not_if { ::File.exists?(pip_binary) } end -python_pip 'setuptools' do - action :upgrade - version node['python']['setuptools_version'] -end +#python_pip 'setuptools' do +# action :upgrade +# version node['python']['setuptools_version'] +#end diff --git a/recipes/virtualenv.rb b/recipes/virtualenv.rb index 8098492..2ac13ab 100644 --- a/recipes/virtualenv.rb +++ b/recipes/virtualenv.rb @@ -23,4 +23,5 @@ python_pip "virtualenv" do action :upgrade version node['python']['virtualenv_version'] + not_if { ::File.exists?("/usr/lib/python2.7/dist-packages/six.py") } end