Merge pull request #275 from dephell/use-ruamel-yaml

Use ruamel.yaml

dephell/commands/base.py

@@ -121,7 +121,7 @@ def _get_locked(self, default_envs: Set[str] = None):
 
         loader_config = self._get_loader_config_for_lockfile()
         if not Path(loader_config['path']).exists():
-            self.error('cannot find dependency file', extra=dict(path=loader_config['path']))
+            self.logger.error('cannot find dependency file', extra=dict(path=loader_config['path']))
             return None
 
         self.logger.info('get dependencies', extra=dict(

dephell/commands/deps_add.py

@@ -33,7 +33,7 @@ def get_parser(cls) -> ArgumentParser:
     def __call__(self) -> bool:
         # get current deps
         if 'from' not in self.config:
-            self.error('`--from` is required for this command')
+            self.logger.error('`--from` is required for this command')
             return False
         converter = CONVERTERS[self.config['from']['format']]
         converter = converter.copy(project_path=Path(self.config['project']))

dephell/commands/deps_convert.py

@@ -28,10 +28,10 @@ def get_parser(cls) -> ArgumentParser:
 
     def __call__(self) -> bool:
         if 'from' not in self.config:
-            self.error('`--from` is required for this command')
+            self.logger.error('`--from` is required for this command')
             return False
         if 'to' not in self.config:
-            self.error('`--to` is required for this command')
+            self.logger.error('`--to` is required for this command')
             return False
         loader = CONVERTERS[self.config['from']['format']]
         loader = loader.copy(project_path=Path(self.config['project']))

pyproject.toml

@@ -148,8 +148,8 @@ m2r = "*"
 packaging = "*"
 pip = ">=18.0"
 pygments = "*"
-pyyaml = "*"  # TODO: replace by ruamel.yaml when migrate from poetry format to flit
 requests = "*"
+"ruamel.yaml" = "*"
 setuptools = "*"
 tomlkit = "*"
 yaspin = "*"

setup.py

@@ -9,10 +9,8 @@
 except ImportError:
     from distutils.core import setup
 
-# built-in
 import os.path
 
-
 readme = ''
 here = os.path.abspath(os.path.dirname(__file__))
 readme_path = os.path.join(here, 'README.rst')
@@ -52,7 +50,8 @@
     ],
     package_data={'dephell': ['templates/*.j2', 'templates/*.sh']},
     install_requires=[
-        'aiohttp', 'appdirs', 'attrs', 'bowler; python_version >= "3.6"',
+        'aiohttp', 'appdirs', 'attrs>=19.1.0',
+        'bowler; python_version >= "3.6"',
         'bowler-py35>=0.9.1; python_version < "3.6"', 'cerberus>=1.3',
         'dephell-archive>=0.1.5', 'dephell-discover>=0.2.6',
         'dephell-licenses>=0.1.6', 'dephell-links>=0.1.4',
@@ -61,18 +60,19 @@
         'dephell-venvs>=0.1.16', 'dephell-versioning', 'docker', 'dockerpty',
         'fissix; python_version >= "3.6"',
         'fissix-py35; python_version < "3.6"', 'html5lib', 'jinja2', 'm2r',
-        'packaging', 'pip>=18.0', 'pyyaml', 'requests', 'setuptools', 'tomlkit',
-        'yaspin','Pygments'
+        'packaging', 'pip>=18.0', 'pygments', 'requests', 'ruamel.yaml',
+        'setuptools', 'tomlkit', 'yaspin'
     ],
     extras_require={
         'full': ['aiofiles', 'autopep8', 'colorama', 'graphviz', 'yapf'],
-        'tests': ['aioresponses', 'pytest', 'requests-mock'],
         'dev': [
             'aioresponses', 'alabaster', 'flake8-isort', 'isort[pyproject]',
             'pygments-github-lexers', 'pytest', 'recommonmark', 'requests-mock',
             'sphinx'
         ],
-        'docs':
-        ['alabaster', 'pygments-github-lexers', 'recommonmark', 'sphinx']
+        'tests': ['aioresponses', 'pytest', 'requests-mock'],
+        'docs': [
+            'alabaster', 'pygments-github-lexers', 'recommonmark', 'sphinx'
+        ]
     },
 )