support pip19

HarryYC · HarryYC · commit 45f46ae1580c · 2019-06-28T11:28:08.000-07:00
diff --git a/files/halite_gem/poise_python/resources/python_package.rb b/files/halite_gem/poise_python/resources/python_package.rb
@@ -50,8 +50,7 @@ module PythonPackage
   # Pip 10 moved all internals to their own package.
   from pip._internal.commands import InstallCommand
   from pip._internal.index import PackageFinder
-  from pip._internal.req import InstallRequirement
-  from pip._internal.req.constructors import install_req_from_line
+
 
 packages = {}
 cmd = InstallCommand()
@@ -75,7 +74,12 @@ module PythonPackage
   finder = PackageFinder(**finder_options)
   find_all = getattr(finder, 'find_all_candidates', getattr(finder, '_find_all_versions', None))
   for arg in args:
-    req = install_req_from_line(arg)
+    try:
+      from pip._internal.req.constructors import install_req_from_line
+      req = install_req_from_line(arg)
+    except ImportError:
+      from pip._internal.req import InstallRequirement
+      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]
diff --git a/files/halite_gem/poise_python/resources/python_runtime_pip.rb b/files/halite_gem/poise_python/resources/python_runtime_pip.rb
@@ -180,6 +180,9 @@ def install_pip
           end
 
           Chef::Log.debug("[#{new_resource}] Installing pip #{new_resource.version} via itself")
+          if pip_version.to_i < 19
+            get_pip_url = 'https://s3.amazonaws.com/a1s-public-software-repository/get-pip.py'
+          end
           notifying_block do
             # Use pip to upgrade (or downgrade) itself.
             python_package 'pip' do
