some cleanup post-PR-merge

Author: r1chardj0n3s

pip_check_reqs/find_extra_reqs.py

@@ -24,7 +24,7 @@ def find_extra_reqs(options):
     for package in search_packages_info(all_pkgs):
         log.debug('installed package: %s (at %s)', package['name'],
             package['location'])
-        for f in package.get('files', []) or []:
+        for f in package.get('files', []):
             path = os.path.realpath(os.path.join(package['location'], f))
             installed_files[path] = package['name']
             package_path = common.is_package_file(path)

requirements.txt

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

setup.py

@@ -10,6 +10,11 @@
 with open(path.join(here, 'CHANGELOG.rst'), encoding='utf-8') as f:
     long_description += f.read()
 
+# This is not usual, but this project needs both install_requires
+# and requirements.txt and we'd like to not duplicate them
+with open(path.join(here, 'requirements.txt'), encoding='utf-8') as f:
+    requirements = [s.strip() for s in f.readlines()]
+
 from pip_check_reqs import __version__
 
 setup(
@@ -38,8 +43,5 @@
             'pip-extra-reqs=pip_check_reqs.find_extra_reqs:main',
         ],
     },
-    install_requires=[
-        'packaging',
-        'pip',
-    ],
+    install_requires=requirements
 )

tests/test_find_extra_reqs.py

@@ -69,7 +69,8 @@ def test_find_extra_reqs(monkeypatch):
         pretend.call_recorder(lambda a, session=None: requirements))
 
     class options:
-        ignore_reqs = lambda x, y: False
+        def ignore_reqs(x, y):
+            return False
     options = options()
 
     result = find_extra_reqs.find_extra_reqs(options)