polylith-cli 1.48.2__tar.gz → 1.48.3__tar.gz

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polylith-cli
-Version: 1.48.2
+Version: 1.48.3
 Summary: Python tooling support for the Polylith Architecture
 License: MIT
 Author: David Vujic

polylith_cli-1.48.3/polylith_cli/polylith/bricks/__init__.py

@@ -0,0 +1,3 @@
+from polylith_cli.polylith.bricks.base import create_base
+from polylith_cli.polylith.bricks.component import create_component
+__all__ = ['create_base', 'create_component']

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/bricks/base.py

@@ -1,6 +1,4 @@
 from pathlib import Path
-from typing import List
-from polylith_cli.polylith.bricks import component
 from polylith_cli.polylith.bricks.brick import create_brick
 from polylith_cli.polylith.repo import bases_dir
 from polylith_cli.polylith.test import create_test
@@ -9,7 +7,4 @@ def create_base(path: Path, options: dict) -> None:
     extra = {'brick': bases_dir}
     base_options = {**options, **extra}
     create_brick(path, base_options)
-    create_test(path, base_options)
-
-def get_bases_data(path: Path, ns: str) -> List[dict]:
-    return component.get_components_data(path, ns, bases_dir)
+    create_test(path, base_options)

polylith_cli-1.48.3/polylith_cli/polylith/bricks/component.py

@@ -0,0 +1,10 @@
+from pathlib import Path
+from polylith_cli.polylith.bricks.brick import create_brick
+from polylith_cli.polylith.repo import components_dir
+from polylith_cli.polylith.test import create_test
+
+def create_component(path: Path, options: dict) -> None:
+    extra = {'brick': components_dir}
+    component_options = {**options, **extra}
+    create_brick(path, component_options)
+    create_test(path, component_options)

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/check/report.py

@@ -47,7 +47,7 @@ def print_unused_bricks(bricks: Set[str], project_name: str) -> None:
     console.print(f':mag_right: {verb} [comp]{unused}[/] needed in [proj]{project_name}[/]?')
 
 def extract_collected_imports(ns: str, imports_in_bases: dict, imports_in_components: dict) -> dict:
-    brick_imports = {'bases': imports.grouping.extract_brick_imports(imports_in_bases, ns), 'components': imports.grouping.extract_brick_imports(imports_in_components, ns)}
+    brick_imports = {'bases': imports.extract_brick_imports(imports_in_bases, ns), 'components': imports.extract_brick_imports(imports_in_components, ns)}
     third_party_imports = {'bases': libs.extract_third_party_imports(imports_in_bases, ns), 'components': libs.extract_third_party_imports(imports_in_components, ns)}
     return {'brick_imports': brick_imports, 'third_party_imports': third_party_imports}
 

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/cli/create.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from polylith_cli.polylith import interactive, project
-from polylith_cli.polylith.bricks import base, component
+from polylith_cli.polylith.bricks import create_base, create_component
 from polylith_cli.polylith.cli import options
 from polylith_cli.polylith.commands.create import create
 from polylith_cli.polylith.workspace.create import create_workspace
@@ -18,12 +18,12 @@ def _try_create(name: str, description: str, fn):
 @app.command('base')
 def base_command(name: Annotated[str, Option(help='Name of the base.')], description: Annotated[str, Option(help='Description of the base.')]=''):
     """Creates a Polylith base."""
-    _try_create(name, description, base.create_base)
+    _try_create(name, description, create_base)
 
 @app.command('component')
 def component_command(name: Annotated[str, Option(help='Name of the component.')], description: Annotated[str, Option(help='Description of the component.')]=''):
     """Creates a Polylith component."""
-    _try_create(name, description, component.create_component)
+    _try_create(name, description, create_component)
 
 def _create_project(root: Path, options: dict):
     name = options['package']

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/commands/deps.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from typing import List, Set
-from polylith_cli.polylith import bricks, deps, info, interface
+from polylith_cli.polylith import deps, info, interface
+from polylith_cli.polylith.dirs import get_bases_data, get_components_data
 
 def get_imports(root: Path, ns: str, bricks: dict) -> dict:
     bases = bricks['bases']
@@ -14,12 +15,12 @@ def pick_name(data: List[dict]) -> Set[str]:
 def get_bases(root: Path, ns: str, project_data: dict) -> Set[str]:
     if project_data:
         return set(project_data.get('bases', []))
-    return pick_name(bricks.get_bases_data(root, ns))
+    return pick_name(get_bases_data(root, ns))
 
 def get_components(root: Path, ns: str, project_data: dict) -> Set[str]:
     if project_data:
         return set(project_data.get('components', []))
-    return pick_name(bricks.get_components_data(root, ns))
+    return pick_name(get_components_data(root, ns))
 
 def used_by_as_bricks(bricks: dict, brick_deps: dict) -> dict:
     bases = bricks['bases']

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/commands/diff.py

@@ -16,7 +16,7 @@ def flatten_bricks(projects_data: List[dict], brick_type: str) -> Set[str]:
     return set(flattened)
 
 def flatten_dependent_bricks(changed_bricks: Set[str], bases: Set[str], components: Set[str], import_data: dict) -> Set[str]:
-    matrix = [deps.core.sorted_used_by(brick, bases, components, import_data) for brick in changed_bricks]
+    matrix = [deps.sorted_used_by(brick, bases, components, import_data) for brick in changed_bricks]
     flattened: List[str] = sum(matrix, [])
     filtered = set(flattened).difference(changed_bricks)
     return filtered

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/commands/test.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from typing import List, Set, Tuple, Union
-from polylith_cli.polylith import bricks, configuration, diff, info, test
+from polylith_cli.polylith import configuration, diff, dirs, info, test
 
 def get_imported_bricks_in_tests(root: Path, ns: str, tag_name: Union[str, None], theme: str) -> Set[str]:
     files = test.get_changed_files(root, tag_name)
@@ -12,8 +12,8 @@ def extract_brick_names(bricks_data: List[dict], imported_bricks: Set[str]) -> S
 
 def get_affected_bricks(root: Path, ns: str, tag_name: Union[str, None], theme: str) -> Tuple[Set[str], Set[str]]:
     found = get_imported_bricks_in_tests(root, ns, tag_name, theme)
-    bases = extract_brick_names(bricks.get_bases_data(root, ns), found)
-    components = extract_brick_names(bricks.get_components_data(root, ns), found)
+    bases = extract_brick_names(dirs.get_bases_data(root, ns), found)
+    components = extract_brick_names(dirs.get_components_data(root, ns), found)
     return (bases, components)
 
 def get_affected_projects(root: Path, ns: str, bases: Set[str], components: Set[str]) -> List[dict]:

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/deps/__init__.py

@@ -1,3 +1,3 @@
-from polylith_cli.polylith.deps.core import calculate_brick_deps, find_bricks_with_circular_dependencies, get_brick_imports
+from polylith_cli.polylith.deps.core import calculate_brick_deps, find_bricks_with_circular_dependencies, get_brick_imports, sorted_used_by
 from polylith_cli.polylith.deps.report import print_brick_deps, print_brick_with_circular_deps, print_bricks_with_circular_deps, print_deps
-__all__ = ['calculate_brick_deps', 'find_bricks_with_circular_dependencies', 'get_brick_imports', 'print_brick_deps', 'print_brick_with_circular_deps', 'print_bricks_with_circular_deps', 'print_deps']
+__all__ = ['calculate_brick_deps', 'find_bricks_with_circular_dependencies', 'get_brick_imports', 'sorted_used_by', 'print_brick_deps', 'print_brick_with_circular_deps', 'print_bricks_with_circular_deps', 'print_deps']

polylith_cli-1.48.3/polylith_cli/polylith/dirs/__init__.py

@@ -0,0 +1,2 @@
+from polylith_cli.polylith.dirs.dirs import create_dir, get_bases_data, get_components_data
+__all__ = ['create_dir', 'get_bases_data', 'get_components_data']

polylith_cli-1.48.2/polylith_cli/polylith/bricks/component.py → polylith_cli-1.48.3/polylith_cli/polylith/dirs/dirs.py

@@ -1,15 +1,16 @@
 from pathlib import Path
 from typing import List
 from polylith_cli.polylith import configuration
-from polylith_cli.polylith.bricks.brick import create_brick
-from polylith_cli.polylith.repo import components_dir
-from polylith_cli.polylith.test import create_test
+from polylith_cli.polylith.files import create_file
+from polylith_cli.polylith.repo import bases_dir, components_dir
+keep_file_name = '.keep'
 
-def create_component(path: Path, options: dict) -> None:
-    extra = {'brick': components_dir}
-    component_options = {**options, **extra}
-    create_brick(path, component_options)
-    create_test(path, component_options)
+def create_dir(path: Path, dir_name: str, keep=False) -> Path:
+    d = path / dir_name
+    d.mkdir(parents=True)
+    if keep:
+        create_file(d, keep_file_name)
+    return d
 
 def is_brick_dir(p: Path) -> bool:
     return p.is_dir() and p.name not in {'__pycache__', '.venv', '.mypy_cache'}
@@ -24,4 +25,7 @@ def get_component_dirs(root: Path, top_dir, ns) -> list:
 
 def get_components_data(root: Path, ns: str, top_dir: str=components_dir) -> List[dict]:
     dirs = get_component_dirs(root, top_dir, ns)
-    return [{'name': d.name} for d in dirs]
+    return [{'name': d.name} for d in dirs]
+
+def get_bases_data(path: Path, ns: str) -> List[dict]:
+    return get_components_data(path, ns, bases_dir)

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/imports/__init__.py

@@ -1,4 +1,4 @@
 from polylith_cli.polylith.imports.grouping import extract_brick_imports, extract_brick_imports_with_namespaces
 from polylith_cli.polylith.imports.parser import extract_top_ns, fetch_all_imports, fetch_excluded_imports, list_imports, parse_module
-from polylith_cli.polylith.imports.usages import SYMBOLS, extract_api, fetch_brick_import_usages
-__all__ = ['extract_brick_imports', 'extract_brick_imports_with_namespaces', 'extract_api', 'extract_top_ns', 'fetch_all_imports', 'fetch_brick_import_usages', 'fetch_excluded_imports', 'list_imports', 'parse_module', 'SYMBOLS']
+from polylith_cli.polylith.imports.usages import SYMBOLS, extract_api, extract_api_part, fetch_brick_import_usages
+__all__ = ['extract_brick_imports', 'extract_brick_imports_with_namespaces', 'extract_api', 'extract_api_part', 'extract_top_ns', 'fetch_all_imports', 'fetch_brick_import_usages', 'fetch_excluded_imports', 'list_imports', 'parse_module', 'SYMBOLS']

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/info/collect.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from typing import List, Set
-from polylith_cli.polylith.bricks import base, component
+from polylith_cli.polylith.dirs import get_bases_data, get_components_data
 from polylith_cli.polylith.info.report import is_project
 from polylith_cli.polylith.project import get_packages_for_projects, parse_package_paths
 
@@ -16,10 +16,10 @@ def get_project_bricks(project_packages: List[dict], components, bases, namespac
     return {'components': components_in_project, 'bases': bases_in_project}
 
 def get_components(root: Path, namespace: str) -> List[str]:
-    return [c['name'] for c in component.get_components_data(root, namespace)]
+    return [c['name'] for c in get_components_data(root, namespace)]
 
 def get_bases(root: Path, namespace: str) -> List[str]:
-    return [b['name'] for b in base.get_bases_data(root, namespace)]
+    return [b['name'] for b in get_bases_data(root, namespace)]
 
 def get_bricks_in_projects(root: Path, components: List[str], bases: List[str], namespace: str) -> List[dict]:
     packages_for_projects = get_packages_for_projects(root)

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/polylith_cli/polylith/interface/usage.py

@@ -16,7 +16,7 @@ def unified_usages(usages: dict) -> Set[str]:
     return {extract_endpoint(f) for f in filtered}
 
 def to_imported_api(brick_imports: Set[str]) -> Set[str]:
-    return {imports.usages.extract_api_part(b) for b in brick_imports}
+    return {imports.extract_api_part(b) for b in brick_imports}
 
 def equals_or_starts_with(brick_import: str, brick: str, ns: str) -> bool:
     brick_ns = f'{ns}.{brick}'

{polylith_cli-1.48.2 → polylith_cli-1.48.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "polylith-cli"
-version = "1.48.2"
+version = "1.48.3"
 description = "Python tooling support for the Polylith Architecture"
 authors = ['David Vujic']
 homepage = "https://davidvujic.github.io/python-polylith-docs/"

polylith_cli-1.48.2/polylith_cli/polylith/bricks/__init__.py

@@ -1,3 +0,0 @@
-from polylith_cli.polylith.bricks.base import create_base, get_bases_data
-from polylith_cli.polylith.bricks.component import create_component, get_components_data
-__all__ = ['create_base', 'create_component', 'get_bases_data', 'get_components_data']

polylith_cli-1.48.2/polylith_cli/polylith/dirs/__init__.py

@@ -1,2 +0,0 @@
-from polylith_cli.polylith.dirs.dirs import create_dir
-__all__ = ['create_dir']

polylith_cli-1.48.2/polylith_cli/polylith/dirs/dirs.py

@@ -1,10 +0,0 @@
-from pathlib import Path
-from polylith_cli.polylith.files import create_file
-keep_file_name = '.keep'
-
-def create_dir(path: Path, dir_name: str, keep=False) -> Path:
-    d = path / dir_name
-    d.mkdir(parents=True)
-    if keep:
-        create_file(d, keep_file_name)
-    return d