Merge ef85b1d into 96e28a1

build.py

@@ -78,7 +78,7 @@
            ]
 url = "http://pybuilder.github.io"
 license = "Apache License"
-version = "0.11.16"
+version = "0.11.17"
 
 requires_python = ">=2.6,!=3.0,!=3.1,!=3.2,<3.7"
 
@@ -98,9 +98,15 @@ def initialize(project):
 
     project.depends_on("tblib")
 
-    project.depends_on("pip", ">=7.1,!=10.*,<10dev")
-    project.depends_on("setuptools", "~=36.0")
-    project.depends_on("wheel", "~=0.29.0")
+    if sys.version_info[0:2] in ((2, 6), (3, 3)):
+        project.depends_on("pip", ">=7.1,!=10.*,<10dev")
+        project.depends_on("setuptools", "~=36.0")
+        project.depends_on("wheel", "~=0.29.0")
+    else:
+        project.depends_on("pip", ">=7.1,<11dev")
+        project.depends_on("setuptools", "~=39.0.0")
+        project.depends_on("wheel", "~=0.31")
+
     project.depends_on("tailer")
 
     project.set_property("verbose", True)

src/main/python/pybuilder/pip_common.py

@@ -18,7 +18,11 @@
 
 from pip._vendor.packaging.specifiers import SpecifierSet, InvalidSpecifier
 from pip._vendor.packaging.version import Version, InvalidVersion
-from pip.commands.show import search_packages_info
+
+try:
+    from pip.commands.show import search_packages_info
+except ImportError:
+    from pip._internal.commands.show import search_packages_info
 
 try:
     # This is the path for pip 7.x and beyond
@@ -45,12 +49,12 @@ def _pip_disallows_insecure_packages_by_default():
     # (2014-01-01) BACKWARD INCOMPATIBLE pip no longer will scrape insecure external urls by default
     # nor will it install externally hosted files by default
     # Also pip v1.1 for example has no __version__
-    return hasattr(pip, "__version__") and pip.__version__ >= '1.5'
+    return hasattr(pip, "__version__") and (pip.__version__ >= '1.5' or pip.__version__ >= '10.0')
 
 
 def _pip_supports_constraints():
     import pip
-    return hasattr(pip, "__version__") and pip.__version__ >= '7.1'
+    return hasattr(pip, "__version__") and (pip.__version__ >= '7.1' or pip.__version__ >= '10.0')
 
 
 def _pip_version():