From 05c4e3301a4a2901edbcaf086d0796214f36e1ac Mon Sep 17 00:00:00 2001 From: Michael Gokhman Date: Tue, 18 Dec 2018 10:18:24 +0200 Subject: [PATCH] fix: remove unsed render code & `import pip` this fails for users that don't have `pip` installed in the env, but this code is not used anyhow --- plug/distPackage.py | 19 ------------------- plug/package.py | 7 ------- plug/reqPackage.py | 17 ----------------- 3 files changed, 43 deletions(-) diff --git a/plug/distPackage.py b/plug/distPackage.py index 4e978a0f..0168e928 100644 --- a/plug/distPackage.py +++ b/plug/distPackage.py @@ -15,25 +15,6 @@ def __init__(self, obj, req=None): self.version_spec = None self.req = req - def render_as_root(self, frozen): - if not frozen: - return '{0}=={1}'.format(self.project_name, self.version) - else: - return self.__class__.frozen_repr(self._obj) - - def render_as_branch(self, frozen): - assert self.req is not None - if not frozen: - parent_ver_spec = self.req.version_spec - parent_str = self.req.project_name - if parent_ver_spec: - parent_str += parent_ver_spec - return ( - '{0}=={1} [requires: {2}]' - ).format(self.project_name, self.version, parent_str) - else: - return self.render_as_root(frozen) - def as_requirement(self): """Return a ReqPackage representation of this DistPackage""" return ReqPackage(self._obj.as_requirement(), dist=self) diff --git a/plug/package.py b/plug/package.py index 0962af02..6fc6d848 100644 --- a/plug/package.py +++ b/plug/package.py @@ -1,5 +1,3 @@ -import pip - class Package(object): """Abstract class for wrappers around objects that pip returns. @@ -24,11 +22,6 @@ def render(self, parent=None, frozen=False): else: return self.render_as_branch(frozen) - @staticmethod - def frozen_repr(obj): - fr = pip.FrozenRequirement.from_dist(obj, []) - return str(fr).strip() - def __getattr__(self, key): return getattr(self._obj, key) diff --git a/plug/reqPackage.py b/plug/reqPackage.py index c07b5d74..17bdd31a 100644 --- a/plug/reqPackage.py +++ b/plug/reqPackage.py @@ -37,23 +37,6 @@ def is_conflicting(self): req_obj = pkg_resources.Requirement.parse(req_version_str) return self.installed_version not in req_obj - def render_as_root(self, frozen): - if not frozen: - return '{0}=={1}'.format(self.project_name, self.installed_version) - elif self.dist: - return self.__class__.frozen_repr(self.dist._obj) - else: - return self.project_name - - def render_as_branch(self, frozen): - if not frozen: - req_ver = self.version_spec if self.version_spec else 'Any' - return ( - '{0} [required: {1}, installed: {2}]' - ).format(self.project_name, req_ver, self.installed_version) - else: - return self.render_as_root(frozen) - def as_dict(self): return {'key': self.key, 'package_name': self.project_name,