Merge pull request #225 from dephell/bump-preserve-extras

Preserve extras

dephell/cache.py

@@ -100,12 +100,12 @@ def load(self):
         return root.dependencies
 
     def dump(self, root):
+        from .controllers import Graph
         from .models import Requirement
 
         self.path.parent.mkdir(parents=True, exist_ok=True)
-        reqs = [Requirement(dep=dep, lock=False) for dep in root.dependencies]
         self.converter.dump(
             path=self.path,
             project=root,
-            reqs=reqs,
+            reqs=Requirement.from_graph(graph=Graph(root), lock=False),
         )

dephell/commands/package_remove.py

@@ -4,6 +4,7 @@
 # app
 from ..actions import get_python_env
 from ..config import builders
+from ..controllers import Graph
 from ..converters import InstalledConverter
 from ..models import Requirement
 from ..package_manager import PackageManager
@@ -40,7 +41,7 @@ def __call__(self) -> bool:
             packages=len(root.dependencies),
             python=python.path,
         ))
-        reqs = [Requirement(dep=dep, lock=True) for dep in root.dependencies]
+        reqs = Requirement.from_graph(graph=Graph(root), lock=True)
         code = manager.remove(reqs=reqs)
         if code != 0:
             return False

dephell/commands/project_bump.py

@@ -10,6 +10,7 @@
 # app
 from ..actions import git_commit, git_tag
 from ..config import builders
+from ..controllers import Graph
 from ..converters import CONVERTERS
 from ..models import Requirement
 from .base import BaseCommand
@@ -122,7 +123,7 @@ def _update_metadata(self, root, loader, new_version) -> bool:
             loader.dump(
                 project=root,
                 path=self.config['from']['path'],
-                reqs=[Requirement(dep=dep, lock=loader.lock) for dep in root.dependencies],
+                reqs=Requirement.from_graph(graph=Graph(root), lock=loader.lock),
             )
             return True