poise-python 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f954d22962ad5f19fbefef8ce992f18bc0f8b73
-  data.tar.gz: 91a35461eaecb05a6e3e5dee93e9b4d551d95403
+  metadata.gz: bef0f55828842107d9397608ee63c0a08007f6d4
+  data.tar.gz: 05b4a93226b282e4b1708f7ec29d7b9f40d6baad
 SHA512:
-  metadata.gz: b108843aca7b5c9f6c4db0f991c88c6179c8b91f406bcb44ae4df0b90ff02106080aa4e53610454f2ce4108c00238b973f119ce4f46cbea88a9eaef47be17c2a
-  data.tar.gz: 60273ff1bc570326fee7b2875210ff4f748dd0620332aeb3bbaa211a83d64ec514c63453f1c216f5444ef5f8f81817c1d286b8837c2f49e9151d3024facb6952
+  metadata.gz: d7084145bf568d242e6c33a1a8560d23ff49de234b2c3e9358e5cee8478dc26ebdd7259db6f86d43db7ab3693efe05d99d5d14cb117e01f892a184b8eed19a93
+  data.tar.gz: 55016a0d57459240bfd38c140628e743011beccfce1130dd6fbb09baa8b8a4221090b8c64e91423bfdf156394d2909104e368552b1f7796f14686205dbfcd21e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Python Changelog
 
+## v1.2.1
+
+* Compatibility with Pip 8.0.
+
 ## v1.2.0
 
 * Add support for passing `user` and `group` to `pip_requirements`.

data/lib/poise_python/resources/python_package.rb

@@ -29,47 +29,44 @@ module PoisePython
     # (see PythonPackage::Resource)
     # @since 1.0.0
     module PythonPackage
-      # A Python snippet to hack pip a bit so `pip list --outdated` will show
-      # only the things we want and will understand version requirements.
-      # @api private
+      # A Python snippet to check which versions of things pip would try to
+      # install. Probably not 100% bulletproof.
       PIP_HACK_SCRIPT = <<-EOH
+import json
 import sys
 
-import pip
-try:
-    # >= 6.0
-    from pip.utils import get_installed_distributions
-except ImportError:
-    # <= 1.5.6
-    from pip.util import get_installed_distributions
-
-def replacement(*args, **kwargs):
-    import copy, sys
-    from pip._vendor import pkg_resources
-    dists = []
-    for raw_req in sys.argv[3:]:
-        if raw_req.startswith('-'):
-            continue
-        req = pkg_resources.Requirement.parse(raw_req)
-        dist = pkg_resources.working_set.by_key.get(req.key)
-        if dist:
-            # Don't mutate stuff from the global working set.
-            dist = copy.copy(dist)
-        else:
-            # Make a fake one.
-            dist = pkg_resources.Distribution(project_name=req.key, version='0')
-        # Fool the .key property into using our string.
-        dist._key = raw_req
-        dists.append(dist)
-    return dists
-try:
-    # For Python 2.
-    get_installed_distributions.func_code = replacement.func_code
-except AttributeError:
-    # For Python 3.
-    get_installed_distributions.__code__ = replacement.__code__
-
-sys.exit(pip.main())
+from pip.commands import InstallCommand
+from pip.index import PackageFinder
+from pip.req import InstallRequirement
+from pip._vendor import pkg_resources
+
+
+packages = {}
+cmd = InstallCommand()
+options, args = cmd.parse_args(sys.argv[1:])
+with cmd._build_session(options) as session:
+  if options.no_index:
+    index_urls = []
+  else:
+    index_urls = [options.index_url] + options.extra_index_urls
+  finder = PackageFinder(
+    find_links=options.find_links,
+    format_control=options.format_control,
+    index_urls=index_urls,
+    trusted_hosts=options.trusted_hosts,
+    allow_all_prereleases=options.pre,
+    process_dependency_links=options.process_dependency_links,
+    session=session,
+  )
+  find_all = getattr(finder, 'find_all_candidates', getattr(finder, '_find_all_versions', None))
+  for arg in args:
+    req = InstallRequirement.from_line(arg)
+    found = finder.find_requirement(req, True)
+    all_candidates = find_all(req.name)
+    candidate = [c for c in all_candidates if c.location == found]
+    if candidate:
+      packages[candidate[0].project.lower()] = str(candidate[0].version)
+json.dump(packages, sys.stdout)
 EOH
 
       # A `python_package` resource to manage Python installations using pip.
@@ -165,7 +162,7 @@ EOH
           end
           # Check for newer candidates.
           outdated = pip_outdated(pip_requirements(resource.package_name, version, parse: true)).stdout
-          parse_pip_outdated(outdated).each do |name, candidate|
+          Chef::JSONCompat.parse(outdated).each do |name, candidate|
             # Merge candidates in to the existing versions.
             version_data[name][:candidate] = candidate
           end
@@ -245,7 +242,7 @@ EOH
 
         # Run a pip command.
         #
-        # @param pip_command [String] The pip subcommand to run (eg. install).
+        # @param pip_command [String, nil] The pip subcommand to run (eg. install).
         # @param pip_options [Array<String>] Options for the pip command.
         # @param opts [Hash] Mixlib::ShellOut options.
         # @return [Mixlib::ShellOut]
@@ -257,7 +254,7 @@ EOH
             "#{runner.join(' ')} #{pip_command} #{new_resource.options} #{Shellwords.join(pip_options)}"
           else
             # No special options, use an array to skip the extra /bin/sh.
-            runner + [pip_command] + pip_options
+            runner + (pip_command ? [pip_command] : []) + pip_options
           end
           # Set user and group.
           opts[:user] = new_resource.user if new_resource.user
@@ -287,25 +284,7 @@ EOH
         # @param requirements [Array<String>] Pip-formatted package requirements.
         # @return [Mixlib::ShellOut]
         def pip_outdated(requirements)
-          pip_command('list', %w{--outdated} + requirements, input: PIP_HACK_SCRIPT, pip_runner: %w{-})
-        end
-
-        # Parse the output from `pip list --outdate`. Returns a hash of package
-        # key to candidate version.
-        #
-        # @param text [String] Output to parse.
-        # @return [Hash<String, String>]
-        def parse_pip_outdated(text)
-          text.split(/\n/).inject({}) do |memo, line|
-            # Example of a line:
-            # boto (Current: 2.25.0 Latest: 2.38.0 [wheel])
-            if md = line.match(/^(\S+)\s+\(.*?latest:\s+([^\s,]+).*\)$/i)
-              memo[md[1].downcase] = md[2]
-            else
-              Chef::Log.debug("[#{new_resource}] Unparsable line in pip outdated: #{line}")
-            end
-            memo
-          end
+          pip_command(nil, requirements, input: PIP_HACK_SCRIPT, pip_runner: %w{-})
         end
 
         # Parse the output from `pip list`. Returns a hash of package key to

data/lib/poise_python/resources/python_runtime_pip.rb

@@ -72,7 +72,8 @@ module PoisePython
         #
         # @return [void]
         def action_install
-          if current_resource.version
+          # If you have older than 7.0.0, we're re-bootstraping because lolno.
+          if current_resource.version && Gem::Version.create(current_resource.version) >= Gem::Version.create('7.0.0')
             install_pip
           else
             bootstrap_pip
@@ -86,6 +87,7 @@ module PoisePython
           notifying_block do
             python_package 'pip' do
               action :uninstall
+              parent_python new_resource.parent
             end
           end
         end
@@ -114,7 +116,7 @@ module PoisePython
             # al. Disable setuptools and wheel as we will install those later.
             # Use the environment vars instead of CLI arguments so I don't have
             # to deal with bootstrap versions that don't support --no-wheel.
-            shell_out!([new_resource.parent.python_binary, temp.path], environment: new_resource.parent.python_environment.merge('PIP_NO_SETUPTOOLS' => '1', 'PIP_NO_WHEEL' => '1'))
+            poise_shell_out!([new_resource.parent.python_binary, temp.path], environment: new_resource.parent.python_environment.merge('PIP_NO_SETUPTOOLS' => '1', 'PIP_NO_WHEEL' => '1'))
           end
           new_pip_version = pip_version
           if new_resource.version && new_pip_version != new_resource.version
@@ -142,6 +144,7 @@ module PoisePython
             # Use pip to upgrade (or downgrade) itself.
             python_package 'pip' do
               action :upgrade
+              parent_python new_resource.parent
               version new_resource.version if new_resource.version
             end
           end
@@ -152,7 +155,7 @@ module PoisePython
         #
         # @return [String, nil]
         def pip_version
-          cmd = shell_out([new_resource.parent.python_binary, '-m', 'pip.__main__', '--version'], environment: new_resource.parent.python_environment)
+          cmd = poise_shell_out([new_resource.parent.python_binary, '-m', 'pip.__main__', '--version'], environment: new_resource.parent.python_environment)
           if cmd.error?
             # Not installed, probably.
             nil

data/lib/poise_python/resources/python_runtime_test.rb

@@ -119,6 +119,11 @@ module PoisePython
             test_import('pytest', 'pytest_venv', python: nil, virtualenv: ::File.join(new_resource.path, 'venv'))
 
             # Create and install a requirements file.
+            # Running this in a venv because of pip 8.0 and Ubuntu packaing
+            # both requests and six.
+            python_virtualenv ::File.join(new_resource.path, 'venv2') do
+              python new_resource.name
+            end
             file ::File.join(new_resource.path, 'requirements.txt') do
               content <<-EOH
 requests==2.7.0
@@ -126,10 +131,20 @@ six==1.8.0
 EOH
             end
             pip_requirements ::File.join(new_resource.path, 'requirements.txt') do
+              virtualenv ::File.join(new_resource.path, 'venv2')
+            end
+            test_import('requests', python: nil, virtualenv: ::File.join(new_resource.path, 'venv2'))
+            test_import('six', python: nil, virtualenv: ::File.join(new_resource.path, 'venv2'))
+
+            # Install a non-latest version of a package.
+            python_virtualenv ::File.join(new_resource.path, 'venv3') do
               python new_resource.name
             end
-            test_import('requests')
-            test_import('six')
+            python_package 'requests' do
+              version '2.8.0'
+              virtualenv ::File.join(new_resource.path, 'venv3')
+            end
+            test_import('requests', 'requests_version', python: nil, virtualenv: ::File.join(new_resource.path, 'venv3'))
 
             # Create a non-root user and test installing with it.
             test_user = "py#{new_resource.name}"

data/lib/poise_python/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/cookbooks/poise-python_test/recipes/default.rb

@@ -21,15 +21,21 @@ package 'lsb-release' if platform?('debian') && node['platform_version'].start_w
 
 python_runtime_test '2'
 
-python_runtime_test '3'
-
-python_runtime_test 'pypy'
+if node['platform'] == 'ubuntu' && node['platform_version'] == '12.04'
+  # Can't deal with Python 3.2 today.
+  file '/no_py3'
+  file '/no_system'
+else
+  python_runtime_test '3'
 
-python_runtime_test 'system' do
-  version ''
-  runtime_provider :system
+  python_runtime_test 'system' do
+    version ''
+    runtime_provider :system
+  end
 end
 
+python_runtime_test 'pypy'
+
 if platform_family?('rhel')
   python_runtime_test 'scl' do
     version ''
@@ -38,3 +44,22 @@ if platform_family?('rhel')
 else
   file '/no_scl'
 end
+
+# Specific test for pip reversion working correctly.
+python_runtime 'pip1' do
+  pip_version '7.1.2'
+  provider :portable_pypy
+  options path: '/opt/pip1'
+  version ''
+end
+python_runtime 'pip2' do
+  provider :portable_pypy
+  options path: '/opt/pip2'
+  version ''
+end
+python_runtime 'pip2b' do
+  pip_version '7.1.2'
+  provider :portable_pypy
+  options path: '/opt/pip2'
+  version ''
+end

data/test/integration/default/serverspec/default_spec.rb

@@ -79,17 +79,27 @@ RSpec.shared_examples 'a python_runtime_test' do |python_name, version=nil|
       its(:content) { is_expected.to eq '1.8.0' }
     end
   end
+
+  describe 'non default version' do
+    assert_file('import_requests_version') do
+      its(:content) { is_expected.to eq '2.8.0' }
+    end
+  end
+
+  describe 'user install' do
+    # assert_file('import_attrs')
+  end
 end
 
-describe 'python 2' do
+describe 'python 2', unless: File.exist?('/no_py2') do
   it_should_behave_like 'a python_runtime_test', '2', '2'
 end
 
-describe 'python 3' do
+describe 'python 3', unless: File.exist?('/no_py3') do
   it_should_behave_like 'a python_runtime_test', '3', '3'
 end
 
-describe 'pypy' do
+describe 'pypy', unless: File.exist?('/no_pypy') do
   it_should_behave_like 'a python_runtime_test', 'pypy'
 end
 
@@ -100,3 +110,15 @@ end
 describe 'scl provider', unless: File.exist?('/no_scl') do
   it_should_behave_like 'a python_runtime_test', 'scl'
 end
+
+describe 'pip reversion test' do
+  describe command('/opt/pip1/bin/pypy -m pip --version') do
+    its(:exit_status) { is_expected.to eq 0 }
+    its(:stdout) { is_expected.to include '7.1.2' }
+  end
+
+  describe command('/opt/pip2/bin/pypy -m pip --version') do
+    its(:exit_status) { is_expected.to eq 0 }
+    its(:stdout) { is_expected.to include '7.1.2' }
+  end
+end

data/test/spec/resources/python_package_spec.rb

@@ -39,7 +39,7 @@ describe PoisePython::Resources::PythonPackage do
         let(:package_name) { 'foo' }
         before do
           stub_cmd(%w{-m pip.__main__ list}, stdout: '')
-          stub_cmd(%w{- list --outdated foo}, input: kind_of(String), stdout: "foo (Current: 0 Latest: 1.0.0 [wheel])\n")
+          stub_cmd(%w{- foo}, input: kind_of(String), stdout: '{"foo":"1.0.0"}')
         end
 
         its(:version) { is_expected.to be nil }
@@ -50,7 +50,7 @@ describe PoisePython::Resources::PythonPackage do
         let(:package_name) { %w{foo bar} }
         before do
           stub_cmd(%w{-m pip.__main__ list}, stdout: '')
-          stub_cmd(%w{- list --outdated foo bar}, input: kind_of(String), stdout: "foo (Current: 0 Latest: 1.0.0 [wheel])\nbar (Current: 0 Latest: 2.0.0 [wheel])\n")
+          stub_cmd(%w{- foo bar}, input: kind_of(String), stdout: '{"foo":"1.0.0","bar":"2.0.0"}')
         end
 
         its(:version) { is_expected.to eq [nil, nil] }
@@ -61,7 +61,7 @@ describe PoisePython::Resources::PythonPackage do
         let(:package_name) { 'foo[bar]' }
         before do
           stub_cmd(%w{-m pip.__main__ list}, stdout: '')
-          stub_cmd(%w{- list --outdated foo}, input: kind_of(String), stdout: "foo (Current: 0 Latest: 1.0.0 [wheel])\n")
+          stub_cmd(%w{- foo}, input: kind_of(String), stdout: '{"foo":"1.0.0"}')
         end
 
         its(:version) { is_expected.to be nil }
@@ -173,37 +173,6 @@ describe PoisePython::Resources::PythonPackage do
       end # /describe action :remove
     end # /describe actions
 
-    describe '#parse_pip_outdated' do
-      let(:text) { '' }
-      subject { test_provider.send(:parse_pip_outdated, text) }
-
-      context 'with no content' do
-        it { is_expected.to eq({}) }
-      end # /context with no content
-
-      context 'with standard content' do
-        let(:text) { <<-EOH }
-boto (Current: 2.25.0 Latest: 2.38.0 [wheel])
-botocore (Current: 0.56.0 Latest: 1.1.1 [wheel])
-certifi (Current: 14.5.14 Latest: 2015.4.28 [wheel])
-cffi (Current: 0.8.1 Latest: 1.1.2 [sdist])
-Fabric (Current: 1.9.1 Latest: 1.10.2 [wheel])
-EOH
-        it { is_expected.to eq({'boto' => '2.38.0', 'botocore' => '1.1.1', 'certifi' => '2015.4.28', 'cffi' => '1.1.2', 'fabric' => '1.10.2'}) }
-      end # /context with standard content
-
-      context 'with malformed content' do
-        let(:text) { <<-EOH }
-boto (Current: 2.25.0 Latest: 2.38.0 [wheel])
-botocore (Current: 0.56.0 Latest: 1.1.1 [wheel])
-certifi (Current: 14.5.14 Latest: 2015.4.28 [wheel])
-cffi (Current: 0.8.1 Latest: 1.1.2 [sdist])
-Fabric (Future: 1.9.1 [wheel])
-EOH
-        it { is_expected.to eq({'boto' => '2.38.0', 'botocore' => '1.1.1', 'certifi' => '2015.4.28', 'cffi' => '1.1.2'}) }
-      end # /context with malformed content
-    end # /describe #parse_pip_outdated
-
     describe '#parse_pip_list' do
       let(:text) { '' }
       subject { test_provider.send(:parse_pip_list, text) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-python
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite