Merge pull request #44 from dephell/fix-analyze-name

Fix analyze name

dephell/commands/deps_add.py

@@ -5,7 +5,7 @@
 # app
 from ..actions import get_resolver
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS
 from ..models import Requirement
 from .base import BaseCommand
@@ -49,7 +49,7 @@ def __call__(self) -> bool:
         resolver.graph.add(new_root)
         resolved = resolver.resolve(level=1, silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/deps_check.py

@@ -4,7 +4,7 @@
 # app
 from ..actions import attach_deps, get_python_env, make_json
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS, InstalledConverter
 from ..models import Requirement
 from .base import BaseCommand
@@ -44,7 +44,7 @@ def __call__(self) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/deps_convert.py

@@ -4,7 +4,7 @@
 # app
 from ..actions import attach_deps
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS
 from ..models import Requirement
 from .base import BaseCommand
@@ -45,7 +45,7 @@ def __call__(self) -> bool:
         # attach
         merged = attach_deps(resolver=resolver, config=self.config, merge=not should_be_resolved)
         if not merged:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False
@@ -55,7 +55,7 @@ def __call__(self) -> bool:
             self.logger.debug('resolving...')
             resolved = resolver.resolve(silent=self.config['silent'])
             if not resolved:
-                conflict = analize_conflict(resolver=resolver)
+                conflict = analyze_conflict(resolver=resolver)
                 self.logger.warning('conflict was found')
                 print(conflict)
                 return False

dephell/commands/deps_install.py

@@ -6,7 +6,7 @@
 # app
 from ..actions import attach_deps, get_python_env
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS, InstalledConverter
 from ..models import Requirement
 from ..package_manager import PackageManager
@@ -49,7 +49,7 @@ def __call__(self) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/deps_licenses.py

@@ -5,7 +5,7 @@
 # app
 from ..actions import attach_deps, make_json
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS
 from .base import BaseCommand
 
@@ -37,7 +37,7 @@ def __call__(self) -> bool:
         # resolve (and merge)
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/deps_tree.py

@@ -5,7 +5,7 @@
 # app
 from ..actions import attach_deps, get_resolver, make_json
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS
 from .base import BaseCommand
 
@@ -44,7 +44,7 @@ def __call__(self) -> bool:
         self.logger.debug('resolving...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/jail_install.py

@@ -10,7 +10,7 @@
 from ..actions import get_entrypoints, get_python, get_resolver
 from ..config import builders
 from ..constants import IS_WINDOWS
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..models import Requirement
 from ..package_manager import PackageManager
 from .base import BaseCommand
@@ -42,7 +42,7 @@ def __call__(self) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/jail_try.py

@@ -13,7 +13,7 @@
 from ..actions import get_python, get_resolver
 from ..config import builders
 from ..context_tools import override_env_vars
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..models import Requirement
 from ..package_manager import PackageManager
 from .base import BaseCommand
@@ -106,7 +106,7 @@ def _install(self, resolver, python_path: Path) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/package_install.py

@@ -4,7 +4,7 @@
 # app
 from ..actions import get_python_env, get_resolver
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..models import Requirement
 from ..package_manager import PackageManager
 from .base import BaseCommand
@@ -36,7 +36,7 @@ def __call__(self) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/package_purge.py

@@ -6,7 +6,7 @@
 # app
 from ..actions import get_python_env
 from ..config import builders
-from ..controllers import analize_conflict, Resolver, Mutator, Graph
+from ..controllers import analyze_conflict, Resolver, Mutator, Graph
 from ..converters import InstalledConverter
 from ..models import Requirement
 from ..package_manager import PackageManager
@@ -52,7 +52,7 @@ def __call__(self) -> bool:
         )
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/project_build.py

@@ -5,7 +5,7 @@
 # app
 from ..actions import attach_deps
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS
 from ..models import Requirement
 from .base import BaseCommand
@@ -47,7 +47,7 @@ def __call__(self) -> bool:
         # attach
         merged = attach_deps(resolver=resolver, config=self.config, merge=True)
         if not merged:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/project_test.py

@@ -13,7 +13,7 @@
 # app
 from ..actions import attach_deps
 from ..config import builders
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..converters import CONVERTERS, WheelConverter
 from ..models import Requirement
 from .base import BaseCommand
@@ -48,7 +48,7 @@ def __call__(self) -> bool:
         # attach
         merged = attach_deps(resolver=resolver, config=self.config, merge=True)
         if not merged:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/commands/venv_run.py

@@ -12,7 +12,7 @@
 from ..actions import get_python, get_resolver, read_dotenv
 from ..config import builders
 from ..context_tools import override_env_vars
-from ..controllers import analize_conflict
+from ..controllers import analyze_conflict
 from ..models import Requirement
 from ..package_manager import PackageManager
 from .base import BaseCommand
@@ -101,7 +101,7 @@ def _install(self, name: str, python_path: Path) -> bool:
         self.logger.info('build dependencies graph...')
         resolved = resolver.resolve(silent=self.config['silent'])
         if not resolved:
-            conflict = analize_conflict(resolver=resolver)
+            conflict = analyze_conflict(resolver=resolver)
             self.logger.warning('conflict was found')
             print(conflict)
             return False

dephell/controllers/__init__.py

@@ -1,5 +1,5 @@
 # app
-from .conflict import analize_conflict
+from .conflict import analyze_conflict
 from .dependency import DependencyMaker
 from .graph import Graph
 from .mutator import Mutator
@@ -10,7 +10,7 @@
 
 
 __all__ = [
-    'analize_conflict',
+    'analyze_conflict',
     'DependencyMaker',
     'Graph',
     'Mutator',

dephell/controllers/conflict.py

@@ -25,12 +25,12 @@
     ('<li>', ' + '),
     ('<hr/>', '\n' + '—' * 80 + '\n'),
 )
-REX_BEGINING = re.compile(r'(\n[ \t]+)')
+REX_BEGINNING = re.compile(r'(\n[ \t]+)')
 
 
 # https://github.com/dephell/dephell/issues/11
 def html2text(text: str) -> str:
-    text = REX_BEGINING.sub('', text)
+    text = REX_BEGINNING.sub('', text)
     for tag, char in REPLACEMENTS:
         text = text.replace(tag, char)
     for tag, _ in REPLACEMENTS:
@@ -40,7 +40,7 @@ def html2text(text: str) -> str:
     return text.strip() + '\n'
 
 
-def analize_conflict(resolver, suffix: str = '') -> str:
+def analyze_conflict(resolver, suffix: str = '') -> str:
     try:
         resolver.graph.draw(suffix=suffix)
     except ImportError as e:

dephell/controllers/resolver.py

@@ -9,7 +9,7 @@
 # app
 from ..context_tools import nullcontext
 from ..models import RootDependency
-from .conflict import analize_conflict
+from .conflict import analyze_conflict
 
 
 logger = getLogger('dephell.resolver')
@@ -191,7 +191,7 @@ def _apply_deps(self, deps, debug: bool = False) -> bool:
             self.graph.conflict = conflict.copy()
 
             if debug:
-                print(analize_conflict(
+                print(analyze_conflict(
                     resolver=self,
                     suffix=str(self.mutator.mutations),
                 ))

tests/helpers.py

@@ -7,7 +7,7 @@
 from packaging.requirements import Requirement as PackagingRequirement
 
 # project
-from dephell.controllers import DependencyMaker, Graph, Mutator, Resolver, analize_conflict
+from dephell.controllers import DependencyMaker, Graph, Mutator, Resolver, analyze_conflict
 from dephell.models import Release, Requirement, RootDependency
 from dephell.repositories import ReleaseRepo
 
@@ -89,7 +89,7 @@ def check(root, resolved=True, missed=None, **deps):
         assert result is resolved
     except AssertionError:
         if result is False:
-            print(analize_conflict(resolver=resolver))
+            print(analyze_conflict(resolver=resolver))
         raise
 
     assert resolver.graph.applied

tests/test_resolving/test_merging.py

@@ -1,5 +1,5 @@
 # project
-from dephell.controllers import Graph, Mutator, Resolver, analize_conflict
+from dephell.controllers import Graph, Mutator, Resolver, analyze_conflict
 
 # app
 from ..helpers import Fake, make_root
@@ -16,7 +16,7 @@ def merge(*roots, merged=True, deps=None):
         assert merged == resolved
     except AssertionError:
         if resolved is False:
-            print(analize_conflict(resolver=resolver))
+            print(analyze_conflict(resolver=resolver))
         raise
 
     if deps: