Skip to content

Commit ce0acae

Browse files
committed
update for recent pip release
1 parent bd1c193 commit ce0acae

File tree

4 files changed

+6
-43
lines changed

4 files changed

+6
-43
lines changed

pip_missing_reqs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.9'
1+
__version__ = '1.2.0'

pip_missing_reqs/find_missing_reqs.py

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,14 @@
88
import re
99
import sys
1010

11-
import pkg_resources
12-
from pip.req import parse_requirements
11+
from pip.commands.show import search_packages_info
1312
from pip.download import PipSession
14-
from pip.util import get_installed_distributions, normalize_name
13+
from pip.req import parse_requirements
14+
from pip.utils import get_installed_distributions, normalize_name
1515

1616
log = logging.getLogger(__name__)
1717

1818

19-
# TODO: remove me when pip 1.6 is released (vendored from pypa/pip git)
20-
def search_packages_info(query): # pragma: no cover
21-
"""
22-
Gather details from installed distributions. Print distribution name,
23-
version, location, and installed files. Installed files requires a
24-
pip generated 'installed-files.txt' in the distributions '.egg-info'
25-
directory.
26-
"""
27-
installed = dict(
28-
[(p.project_name.lower(), p) for p in pkg_resources.working_set])
29-
query_names = [name.lower() for name in query]
30-
for dist in [installed[pkg] for pkg in query_names if pkg in installed]:
31-
package = {
32-
'name': dist.project_name,
33-
'version': dist.version,
34-
'location': dist.location,
35-
'requires': [dep.project_name for dep in dist.requires()],
36-
}
37-
file_list = None
38-
if isinstance(dist, pkg_resources.DistInfoDistribution):
39-
# RECORDs should be part of .dist-info metadatas
40-
if dist.has_metadata('RECORD'):
41-
lines = dist.get_metadata_lines('RECORD')
42-
paths = [l.split(',')[0] for l in lines]
43-
paths = [os.path.join(dist.location, p) for p in paths]
44-
file_list = [os.path.relpath(p, dist.location) for p in paths]
45-
else:
46-
# Otherwise use pip's log for .egg-info's
47-
if dist.has_metadata('installed-files.txt'):
48-
paths = dist.get_metadata_lines('installed-files.txt')
49-
paths = [os.path.join(dist.egg_info, p) for p in paths]
50-
file_list = [os.path.relpath(p, dist.location) for p in paths]
51-
# use and short-circuit to check for None
52-
package['files'] = file_list and sorted(file_list)
53-
yield package
54-
55-
5619
class FoundModule:
5720
def __init__(self, modname, filename, locations=None):
5821
self.modname = modname

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pip>1.5
1+
pip>=6.0.8

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author_email='[email protected]',
2323
license='MIT',
2424
classifiers=[
25-
'Development Status :: 4 - Beta',
25+
'Development Status :: 5 - Stable',
2626
'Intended Audience :: Developers',
2727
'Topic :: Software Development :: Build Tools',
2828
'License :: OSI Approved :: MIT License',

0 commit comments

Comments
 (0)