Rooba
/
pipdeptree
mirror of https://github.com/tox-dev/pipdeptree.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix imports for pip version 10.0.0 and -f option 

This was fixed to work with pip 10.0.0 in an earlier commit but import
import of 'FrozenRequirement' was still broken. It is only invoked
when running with '-f' option and is fixed in this commit.
This commit is contained in:
Vineet Naik 2018-04-15 10:36:22 +05:30
parent 3520b6749d
commit abb8a96441
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pipdeptree.py
View File

@ -14,9 +14,10 @@ except ImportError:
from ordereddict import OrderedDict from ordereddict import OrderedDict
try: try:
import pip._internal as pip from pip._internal import get_installed_distributions
from pip._internal.operations.freeze import FrozenRequirement
except ImportError: except ImportError:
import pip from pip import get_installed_distributions, FrozenRequirement
import pkg_resources import pkg_resources
# inline: # inline:
@ -155,7 +156,7 @@ class Package(object):
@staticmethod @staticmethod
def frozen_repr(obj): def frozen_repr(obj):
fr = pip.FrozenRequirement.from_dist(obj, []) fr = FrozenRequirement.from_dist(obj, [])
return str(fr).strip() return str(fr).strip()
def __getattr__(self, key): def __getattr__(self, key):
@ -551,7 +552,7 @@ def main():
parser = get_parser() parser = get_parser()
args = parser.parse_args() args = parser.parse_args()
pkgs = pip.get_installed_distributions(local_only=args.local_only, pkgs = get_installed_distributions(local_only=args.local_only,
user_only=args.user_only) user_only=args.user_only)
dist_index = build_dist_index(pkgs) dist_index = build_dist_index(pkgs)