Merge pull request #366 from dephell/simplify-graph-clear

Simplify graph cleaning

dephell/controllers/_resolver.py

@@ -84,8 +84,10 @@ def resolve(self, debug: bool = False, silent: bool = False, level: Optional[int
         with spinner as spinner:
             while True:
                 resolved = self._resolve(debug=debug, silent=silent, level=level, spinner=spinner)
-                if resolved is not None:
-                    return resolved
+                if resolved is None:
+                    continue
+                self.graph.clear()  # remove unused deps from graph
+                return resolved
 
     def _resolve(self, debug: bool, silent: bool, level: Optional[int], spinner) -> Optional[bool]:
         if silent:

dephell/models/requirement.py

@@ -27,7 +27,6 @@ def __init__(self, dep, lock: bool, roots: Iterable[str] = None):
     def from_graph(cls, graph, *, lock: bool) -> Tuple['Requirement', ...]:
         result = OrderedDict()
         extras = defaultdict(list)
-        applied = graph.applied
         roots = [root.name for root in graph.get_layer(0)]
 
         # if roots wasn't applied then apply them
@@ -39,8 +38,6 @@ def from_graph(cls, graph, *, lock: bool) -> Tuple['Requirement', ...]:
         # get all nodes
         for layer in reversed(graph._layers[1:]):  # skip roots
             for dep in sorted(layer):
-                if applied and not dep.applied:
-                    continue
                 if dep.constraint.empty:
                     continue
                 if dep.extra is None: