fix pip.py to work with command line and fix this

Author: k-okada

src/rosdep2/platforms/pip.py

@@ -30,7 +30,9 @@
 from __future__ import print_function
 
 import pkg_resources
+import re
 import subprocess
+from distutils.version import LooseVersion
 
 from ..core import InstallFailed, InvalidData
 from ..installers import PackageManagerInstaller
@@ -67,8 +69,16 @@ def pip_detect(pkgs, exec_fn=None):
     ret_list = []
     for pkg in pkg_list:
         pkg_row = pkg.split('==')
-        if pkg_row[0] in pkgs:
-            ret_list.append(pkg_row[0])
+        for pkg in pkgs:
+            pkg_versioned = re.findall(r'\s*([a-zA-Z_][a-zA-Z_\-0-9]*)([=<>]*)([0-9\.]*)', pkg)[0]
+            if pkg_row[0] == pkg_versioned[0]:
+                if ((pkg_versioned[1] == '' and pkg_row[0] == pkg_versioned[0]) or
+                    ((pkg_versioned[1] == '==' and LooseVersion(pkg_row[1]) == LooseVersion(pkg_versioned[2])) or
+                     (pkg_versioned[1] == '>=' and LooseVersion(pkg_row[1]) >= LooseVersion(pkg_versioned[2])) or
+                     (pkg_versioned[1] == '<=' and LooseVersion(pkg_row[1]) <= LooseVersion(pkg_versioned[2])) or
+                     (pkg_versioned[1] == '>' and LooseVersion(pkg_row[1]) > LooseVersion(pkg_versioned[2])) or
+                     (pkg_versioned[1] == '<' and LooseVersion(pkg_row[1]) < LooseVersion(pkg_versioned[2])))):
+                    ret_list.append(pkg)
 
     # Try to detect with the return code of `pip show`.
     # This can show the existance of things like `argparse` which
@@ -141,9 +151,6 @@ def resolve(self, rosdep, rosdep_args):
                 package = package + ',' if pip_specify_version else package
                 packages[i] = package + '<' + rosdep.version_lt
             pip_specify_version = True
-        if pip_specify_version:
-            for i, package in list(enumerate(packages)):
-                packages[i] = "'" + package + "'"
 
         return packages
 

test/test_rosdep_pip.py

@@ -86,20 +86,20 @@ def test_PackageManagerInstaller_resolve():
     assert ['baz', 'bar'] == installer.resolve(Dependency('baz'), ['baz', 'bar'])
 
     # version_eq
-    assert ["'baz==1.0'"] == installer.resolve(Dependency('baz', version_eq='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
-    assert ["'baz==1.0'", "'bar==1.0'"] == installer.resolve(Dependency('baz', version_eq='1.0'), dict(packages=['baz', 'bar']))
+    assert ['baz==1.0'] == installer.resolve(Dependency('baz', version_eq='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
+    assert ['baz==1.0', 'bar==1.0'] == installer.resolve(Dependency('baz', version_eq='1.0'), dict(packages=['baz', 'bar']))
     # version_gte
-    assert ["'baz>=1.0'"] == installer.resolve(Dependency('baz', version_gte='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
-    assert ["'baz>=1.0'", "'bar>=1.0'"] == installer.resolve(Dependency('baz', version_gte='1.0'), dict(packages=['baz', 'bar']))
+    assert ['baz>=1.0'] == installer.resolve(Dependency('baz', version_gte='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
+    assert ['baz>=1.0', 'bar>=1.0'] == installer.resolve(Dependency('baz', version_gte='1.0'), dict(packages=['baz', 'bar']))
     # version_lte
-    assert ["'baz<=1.0'"] == installer.resolve(Dependency('baz', version_lte='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
-    assert ["'baz<=1.0'", "'bar<=1.0'"] == installer.resolve(Dependency('baz', version_lte='1.0'), dict(packages=['baz', 'bar']))
+    assert ['baz<=1.0'] == installer.resolve(Dependency('baz', version_lte='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
+    assert ['baz<=1.0', 'bar<=1.0'] == installer.resolve(Dependency('baz', version_lte='1.0'), dict(packages=['baz', 'bar']))
     # version_gt
-    assert ["'baz>1.0'"] == installer.resolve(Dependency('baz', version_gt='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
-    assert ["'baz>1.0'", "'bar>1.0'"] == installer.resolve(Dependency('baz', version_gt='1.0'), dict(packages=['baz', 'bar']))
+    assert ['baz>1.0'] == installer.resolve(Dependency('baz', version_gt='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
+    assert ['baz>1.0', 'bar>1.0'] == installer.resolve(Dependency('baz', version_gt='1.0'), dict(packages=['baz', 'bar']))
     # version_lt
-    assert ["'baz<1.0'"] == installer.resolve(Dependency('baz', version_lt='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
-    assert ["'baz<1.0'", "'bar<1.0'"] == installer.resolve(Dependency('baz', version_lt='1.0'), dict(packages=['baz', 'bar']))
+    assert ['baz<1.0'] == installer.resolve(Dependency('baz', version_lt='1.0'), dict(depends=['foo', 'bar'], packages=['baz']))
+    assert ['baz<1.0', 'bar<1.0'] == installer.resolve(Dependency('baz', version_lt='1.0'), dict(packages=['baz', 'bar']))
     # test invalid data
     try:
         installer.resolve({}, 0)