Fix pip 18.1 compatibility issues

This branch and fork to be removed when poise-python is released. poise#133 (comment)
shareaholic · Jan 15, 2019 · fd600f1 · fd600f1
1 parent eeb0fc0
commit fd600f1
Show file tree

Hide file tree

Showing 73 changed files with 38 additions and 2,313 deletions.
diff --git a/Gemfile b/Gemfile
diff --git a/Rakefile b/Rakefile
diff --git a/chef/attributes/default.rb → attributes/default.rb b/chef/attributes/default.rb → attributes/default.rb
diff --git a/lib/poise_python.rb → files/halite_gem/poise_python.rb b/lib/poise_python.rb → files/halite_gem/poise_python.rb
diff --git a/lib/poise_python/cheftie.rb → files/halite_gem/poise_python/cheftie.rb b/lib/poise_python/cheftie.rb → files/halite_gem/poise_python/cheftie.rb
diff --git a/lib/poise_python/error.rb → files/halite_gem/poise_python/error.rb b/lib/poise_python/error.rb → files/halite_gem/poise_python/error.rb
diff --git a/lib/poise_python/python_command_mixin.rb → ..._gem/poise_python/python_command_mixin.rb b/lib/poise_python/python_command_mixin.rb → ..._gem/poise_python/python_command_mixin.rb
diff --git a/lib/poise_python/python_providers.rb → ...lite_gem/poise_python/python_providers.rb b/lib/poise_python/python_providers.rb → ...lite_gem/poise_python/python_providers.rb
diff --git a/lib/poise_python/python_providers/base.rb → ...gem/poise_python/python_providers/base.rb b/lib/poise_python/python_providers/base.rb → ...gem/poise_python/python_providers/base.rb
diff --git a/lib/poise_python/python_providers/dummy.rb → ...em/poise_python/python_providers/dummy.rb b/lib/poise_python/python_providers/dummy.rb → ...em/poise_python/python_providers/dummy.rb
diff --git a/lib/poise_python/python_providers/msi.rb → ..._gem/poise_python/python_providers/msi.rb b/lib/poise_python/python_providers/msi.rb → ..._gem/poise_python/python_providers/msi.rb
diff --git a/..._python/python_providers/portable_pypy.rb → ..._python/python_providers/portable_pypy.rb b/..._python/python_providers/portable_pypy.rb → ..._python/python_providers/portable_pypy.rb
diff --git a/...python/python_providers/portable_pypy3.rb → ...python/python_providers/portable_pypy3.rb b/...python/python_providers/portable_pypy3.rb → ...python/python_providers/portable_pypy3.rb
diff --git a/lib/poise_python/python_providers/scl.rb → ..._gem/poise_python/python_providers/scl.rb b/lib/poise_python/python_providers/scl.rb → ..._gem/poise_python/python_providers/scl.rb
diff --git a/lib/poise_python/python_providers/system.rb → ...m/poise_python/python_providers/system.rb b/lib/poise_python/python_providers/system.rb → ...m/poise_python/python_providers/system.rb
diff --git a/lib/poise_python/resources.rb → files/halite_gem/poise_python/resources.rb b/lib/poise_python/resources.rb → files/halite_gem/poise_python/resources.rb
diff --git a/...oise_python/resources/pip_requirements.rb → ...oise_python/resources/pip_requirements.rb b/...oise_python/resources/pip_requirements.rb → ...oise_python/resources/pip_requirements.rb
diff --git a/lib/poise_python/resources/python_execute.rb → .../poise_python/resources/python_execute.rb b/lib/poise_python/resources/python_execute.rb → .../poise_python/resources/python_execute.rb
diff --git a/lib/poise_python/resources/python_package.rb → .../poise_python/resources/python_package.rb b/lib/poise_python/resources/python_package.rb → .../poise_python/resources/python_package.rb
diff --git a/lib/poise_python/resources/python_runtime.rb → .../poise_python/resources/python_runtime.rb b/lib/poise_python/resources/python_runtime.rb → .../poise_python/resources/python_runtime.rb
diff --git a/...se_python/resources/python_runtime_pip.rb → ...se_python/resources/python_runtime_pip.rb b/...se_python/resources/python_runtime_pip.rb → ...se_python/resources/python_runtime_pip.rb
diff --git a/...e_python/resources/python_runtime_test.rb → ...e_python/resources/python_runtime_test.rb b/...e_python/resources/python_runtime_test.rb → ...e_python/resources/python_runtime_test.rb
diff --git a/...ise_python/resources/python_virtualenv.rb → ...ise_python/resources/python_virtualenv.rb b/...ise_python/resources/python_virtualenv.rb → ...ise_python/resources/python_virtualenv.rb
diff --git a/lib/poise_python/utils.rb → files/halite_gem/poise_python/utils.rb b/lib/poise_python/utils.rb → files/halite_gem/poise_python/utils.rb
diff --git a/lib/poise_python/utils/python_encoder.rb → ..._gem/poise_python/utils/python_encoder.rb b/lib/poise_python/utils/python_encoder.rb → ..._gem/poise_python/utils/python_encoder.rb
diff --git a/lib/poise_python/version.rb → files/halite_gem/poise_python/version.rb b/lib/poise_python/version.rb → files/halite_gem/poise_python/version.rb
diff --git a/test/gemfiles/chef-12.gemfile → libraries/default.rb b/test/gemfiles/chef-12.gemfile → libraries/default.rb
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
-
-gem 'chef', '~> 12.21'
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)
+require "poise_python/cheftie"
diff --git a/metadata.rb b/metadata.rb
diff --git a/poise-python.gemspec b/poise-python.gemspec
diff --git a/chef/recipes/default.rb → recipes/default.rb b/chef/recipes/default.rb → recipes/default.rb
diff --git a/test/cookbook/metadata.rb b/test/cookbook/metadata.rb
diff --git a/test/cookbook/recipes/default.rb b/test/cookbook/recipes/default.rb
diff --git a/test/docker/docker.ca b/test/docker/docker.ca
diff --git a/test/docker/docker.pem b/test/docker/docker.pem
diff --git a/test/gemfiles/chef-12.16.gemfile b/test/gemfiles/chef-12.16.gemfile
diff --git a/test/gemfiles/chef-12.17.gemfile b/test/gemfiles/chef-12.17.gemfile