Merge branch 'multiroot'

dephell/__init__.py

@@ -1,4 +1,5 @@
 # app
 from .controllers import *  # noQA
-from .converters import *  # noQA
-from .models import *  # noQA
+from .converters import *   # noQA
+from .models import *       # noQA
+from .__version__ import *  # noQA

dephell/__version__.py

@@ -0,0 +1,4 @@
+
+__version__ = '0.3.1'
+__author__ = 'Gram (@orsinium)'
+__license__ = 'MIT'

dephell/commands/__init__.py

@@ -12,6 +12,7 @@
 from .generate_license import GenerateLicenseCommand
 from .inspect_config import InspectConfigCommand
 from .inspect_gadget import InspectGadgetCommand
+from .inspect_self import InspectSelfCommand
 from .inspect_venv import InspectVenvCommand
 from .jail_install import JailInstallCommand
 from .jail_list import JailListCommand
@@ -42,6 +43,7 @@
     'GenerateLicenseCommand',
     'InspectConfigCommand',
     'InspectGadgetCommand',
+    'InspectSelfCommand',
     'InspectVenvCommand',
     'JailInstallCommand',
     'JailListCommand',
@@ -73,6 +75,7 @@
     'generate editorconfig': GenerateEditorconfigCommand,
     'generate license': GenerateLicenseCommand,
     'inspect config': InspectConfigCommand,
+    'inspect self': InspectSelfCommand,
     'inspect venv': InspectVenvCommand,
     'inspect gadget': InspectGadgetCommand,
     'jail install': JailInstallCommand,

dephell/commands/inspect_self.py

@@ -0,0 +1,36 @@
+# built-in
+import sys
+from argparse import ArgumentParser
+from pathlib import Path
+
+# app
+from ..actions import make_json
+from ..config import builders
+from ..__version__ import __version__
+from .base import BaseCommand
+
+
+class InspectSelfCommand(BaseCommand):
+    """Show information about DepHell installation.
+
+    https://dephell.readthedocs.io/en/latest/cmd-inspect-self.html
+    """
+    @classmethod
+    def get_parser(cls):
+        parser = ArgumentParser(
+            prog='dephell inspect self',
+            description=cls.__doc__,
+        )
+        builders.build_config(parser)
+        builders.build_output(parser)
+        builders.build_other(parser)
+        return parser
+
+    def __call__(self):
+        data = dict(
+            path=str(Path(__file__).parent.parent),
+            python=sys.executable,
+            version=__version__,
+        )
+        print(make_json(data=data, key=self.config.get('filter')))
+        return True

dephell/controllers/graph.py

@@ -63,13 +63,11 @@ def __repr__(self):
 
 
 class Graph:
-    def __init__(self, root=None):
-        if root is not None:
+    def __init__(self, *roots):
+        for root in roots:
             if not root.dependencies:
                 logger.warning('empty root passed')
-            self._roots = [root]
-        else:
-            self._roots = []
+        self._roots = list(roots)
         self._layers = []
         self.reset()
 

dephell/converters/egginfo.py

@@ -199,7 +199,7 @@ def dump(self, reqs, path: Path, project: RootDependency) -> None:
             return
 
         if path.suffix != '.egg-info':
-            path /= project.name + '.egg-info'
+            path /= project.name.replace('-', '_') + '.egg-info'
         path.mkdir(exist_ok=True, parents=True)
 
         (path / 'dependency_links.txt').touch()

dephell/converters/sdist.py

@@ -90,7 +90,7 @@ def dump(self, reqs, path: Path, project: RootDependency) -> None:
             # write metafiles
             self._write_content(tar=tar, path='PKG-INFO', content=info)
             for fname, getter in getters.items():
-                fpath = '{}.egg-info/{}'.format(project.name, fname)
+                fpath = '{}.egg-info/{}'.format(project.name.replace('-', '_'), fname)
                 self._write_content(tar=tar, path=fpath, content=getter())
 
             # write packages

dephell/models/root.py

@@ -101,6 +101,9 @@ def merge(self, dep):
     def unapply(self, name: str):
         raise NotImplementedError
 
+    def copy(self):
+        return type(self)(**attr.asdict(self, recurse=False))
+
     @classmethod
     def get_metainfo(cls, other, *others):
         """Merge metainfo, but not dependencies

docs/cmd-inspect-self.md

@@ -0,0 +1,17 @@
+# dephell inspect self
+
+Shows information about DepHell installation.
+
+```bash
+$ dephell inspect self
+{
+  "path": "/home/gram/Documents/dephell/dephell",
+  "python": "/usr/local/bin/python3.7",
+  "version": "0.3.1"
+}
+```
+
+## See also
+
+1. [dephell autocomplete](cmd-venv-create) to enable params autocomplete for commands in your shell.
+1. [dephell inspect config](cmd-inspect-config) to get information about config parameters.

docs/index.md

@@ -45,6 +45,7 @@
     :caption: Inspect
 
     cmd-inspect-config
+    cmd-inspect-self
     cmd-inspect-venv
 
 .. toctree::

tests/test_commands/test_build.py

@@ -18,6 +18,6 @@ def test_build_command(temp_path: Path):
     result = command()
     assert result is True
     assert (temp_path / 'setup.py').exists()
-    assert (temp_path / 'my-package.egg-info' / 'PKG-INFO').exists()
+    assert (temp_path / 'my_package.egg-info' / 'PKG-INFO').exists()
     assert (temp_path / 'dist' / 'my-package-0.1.0.tar.gz').exists()
     assert (temp_path / 'dist' / 'my_package-0.1.0-py3-none-any.whl').exists()