Merge pull request #18 from KarrLab/master

Updating for pip 10.0.1

Author: r1chardj0n3s

pip_check_reqs/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.1'
+__version__ = '2.0.3'

pip_check_reqs/common.py

@@ -3,11 +3,12 @@
 import imp
 import logging
 import os
+import pkg_resources
 import re
 
 from packaging.utils import canonicalize_name
-from pip.download import PipSession
-from pip.req import parse_requirements
+from pip._internal.download import PipSession
+from pip._internal.req.req_file import parse_requirements
 
 log = logging.getLogger(__name__)
 
@@ -155,3 +156,43 @@ def f(candidate, ignore_cfg=ignore_cfg):
                 return True
         return False
     return f
+
+
+def search_packages_info(query):
+    """
+    Gather details from installed distributions. Print distribution name,
+    version, location, and installed files. Installed files requires a
+    pip generated 'installed-files.txt' in the distributions '.egg-info'
+    directory.
+    """
+    installed = {}
+    for p in pkg_resources.working_set:
+        installed[canonicalize_name(p.project_name)] = p
+
+    query_names = [canonicalize_name(name) for name in query]
+
+    for dist in [installed[pkg] for pkg in query_names if pkg in installed]:
+        package = {
+            'name': dist.project_name,
+            'version': dist.version,
+            'location': dist.location,
+            'requires': [dep.project_name for dep in dist.requires()],
+        }
+        file_list = None
+        if isinstance(dist, pkg_resources.DistInfoDistribution):
+            # RECORDs should be part of .dist-info metadatas
+            if dist.has_metadata('RECORD'):
+                lines = dist.get_metadata_lines('RECORD')
+                paths = [l.split(',')[0] for l in lines]
+                paths = [os.path.join(dist.location, p) for p in paths]
+                file_list = [os.path.relpath(p, dist.location) for p in paths]
+        else:
+            # Otherwise use pip's log for .egg-info's
+            if dist.has_metadata('installed-files.txt'):
+                paths = dist.get_metadata_lines('installed-files.txt')
+                paths = [os.path.join(dist.egg_info, p) for p in paths]
+                file_list = [os.path.relpath(p, dist.location) for p in paths]
+
+        if file_list:
+            package['files'] = sorted(file_list)
+        yield package

pip_check_reqs/find_extra_reqs.py

@@ -5,10 +5,10 @@
 import sys
 
 from packaging.utils import canonicalize_name
-from pip.commands.show import search_packages_info
-from pip.utils import get_installed_distributions
-
+#from pip._internal.commands.show import search_packages_info
+from pip._internal.utils.misc import get_installed_distributions
 from pip_check_reqs import common
+from pip_check_reqs.common import search_packages_info
 
 log = logging.getLogger(__name__)
 

pip_check_reqs/find_missing_reqs.py

@@ -5,12 +5,13 @@
 import sys
 
 from packaging.utils import canonicalize_name
-from pip.commands.show import search_packages_info
-from pip.download import PipSession
-from pip.req import parse_requirements
-from pip.utils import get_installed_distributions
+#from pip._internal.commands.show import search_packages_info
+from pip._internal.download import PipSession
+from pip._internal.req.req_file import parse_requirements
+from pip._internal.utils.misc import get_installed_distributions
 
 from pip_check_reqs import common
+from pip_check_reqs.common import search_packages_info
 
 log = logging.getLogger(__name__)
 

requirements.txt

@@ -1,2 +1,2 @@
 packaging
-pip>=6.0
+pip >= 10.0.1

setup.py

@@ -24,7 +24,7 @@
         'Find packages that should or should not be in requirements for a '
         'project',
     long_description=long_description,
-    url='https://github.com/r1chardj0n3s/pip-check-reqs',
+    url='https://github.com/KarrLab/pip-check-reqs',
     author='Richard Jonees',
     author_email='[email protected]',
     license='MIT',

test-requirements.txt

@@ -1,4 +1,3 @@
 coverage
 pretend
-pytest
-pytest-capturelog
+pytest

tests/test_common.py

@@ -119,7 +119,7 @@ def __exit__(self, *args):
             pass
     monkeypatch.setattr(common, 'open', FakeFile, raising=False)
 
-    caplog.setLevel(logging.INFO)
+    caplog.set_level(logging.INFO)
 
     class options:
         paths = ['dummy']
@@ -142,7 +142,7 @@ def ignore_mods(module):
     assert result['ast'].locations == locs
 
     if ignore_ham:
-        assert caplog.records()[0].message == 'ignoring: ham.py'
+        assert caplog.records[0].message == 'ignoring: ham.py'
 
 
 @pytest.mark.parametrize(["ignore_cfg", "candidate", "result"], [

tests/test_find_extra_reqs.py

@@ -80,7 +80,7 @@ def ignore_reqs(x, y):
 def test_main_failure(monkeypatch, caplog, fake_opts):
     monkeypatch.setattr(optparse, 'OptionParser', fake_opts)
 
-    caplog.setLevel(logging.WARN)
+    caplog.set_level(logging.WARN)
 
     monkeypatch.setattr(find_extra_reqs, 'find_extra_reqs', lambda x: [
         'extra'
@@ -90,9 +90,9 @@ def test_main_failure(monkeypatch, caplog, fake_opts):
         find_extra_reqs.main()
         assert excinfo.value == 1
 
-    assert caplog.records()[0].message == \
+    assert caplog.records[0].message == \
         'Extra requirements:'
-    assert caplog.records()[1].message == \
+    assert caplog.records[1].message == \
         'extra in requirements.txt'
 
 
@@ -145,7 +145,7 @@ def parse_args(self):
             (logging.WARN, 'warn')]:
         find_extra_reqs.log.log(*event)
 
-    messages = [r.message for r in caplog.records()]
+    messages = [r.message for r in caplog.records]
     # first message is always the usage message
     if verbose_cfg or debug_cfg:
         assert messages[1:] == result

tests/test_find_missing_reqs.py

@@ -74,7 +74,7 @@ def test_find_missing_reqs(monkeypatch):
 def test_main_failure(monkeypatch, caplog, fake_opts):
     monkeypatch.setattr(optparse, 'OptionParser', fake_opts)
 
-    caplog.setLevel(logging.WARN)
+    caplog.set_level(logging.WARN)
 
     monkeypatch.setattr(find_missing_reqs, 'find_missing_reqs', lambda x: [
         ('missing', [common.FoundModule('missing', 'missing.py',
@@ -85,9 +85,9 @@ def test_main_failure(monkeypatch, caplog, fake_opts):
         find_missing_reqs.main()
         assert excinfo.value == 1
 
-    assert caplog.records()[0].message == \
+    assert caplog.records[0].message == \
         'Missing requirements:'
-    assert caplog.records()[1].message == \
+    assert caplog.records[1].message == \
         'location.py:1 dist=missing module=missing'
 
 
@@ -139,7 +139,7 @@ def parse_args(self):
             (logging.WARN, 'warn')]:
         find_missing_reqs.log.log(*event)
 
-    messages = [r.message for r in caplog.records()]
+    messages = [r.message for r in caplog.records]
     # first message is always the usage message
     if verbose_cfg or debug_cfg:
         assert messages[1:] == result