polylith-cli 0.1.0__tar.gz → 0.2.0__tar.gz

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polylith-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python tooling support for the Polylith Architecture
 Home-page: https://davidvujic.github.io/python-polylith-docs/
 License: MIT

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/polylith_cli/polylith/commands/check.py

@@ -1,21 +1,20 @@
-import importlib.metadata
 from pathlib import Path
-from polylith_cli.polylith import alias, check, distributions
+from typing import Set
+from polylith_cli.polylith import check, distributions
+
+def collect_known_aliases(project_data: dict, options: dict) -> Set[str]:
+    deps = project_data['deps']
+    library_alias = options['alias']
+    return distributions.known_aliases_and_sub_dependencies(deps, library_alias)
 
 def run(root: Path, ns: str, project_data: dict, options: dict) -> bool:
     is_verbose = options['verbose']
     is_quiet = options['quiet']
     is_strict = options['strict']
-    library_alias = options['alias']
-    third_party_libs = project_data['deps']
     name = project_data['name']
     collected_imports = check.report.collect_all_imports(root, ns, project_data)
-    dists = importlib.metadata.distributions()
-    known_aliases = distributions.distributions_packages(dists)
-    known_aliases.update(alias.parse(library_alias))
-    extra = alias.pick(known_aliases, third_party_libs)
-    libs = third_party_libs.union(extra)
-    details = check.report.create_report(project_data, collected_imports, libs, is_strict)
+    collected_libs = collect_known_aliases(project_data, options)
+    details = check.report.create_report(project_data, collected_imports, collected_libs, is_strict)
     res = all([not details['brick_diff'], not details['libs_diff']])
     if not is_quiet:
         check.report.print_missing_deps(details['brick_diff'], name)

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/polylith_cli/polylith/commands/libs.py

@@ -1,16 +1,14 @@
 from pathlib import Path
-from polylith_cli.polylith import alias
+from polylith_cli.polylith import distributions
 from polylith_cli.polylith.libs import report
 
 def run(root: Path, ns: str, project_data: dict, options: dict) -> bool:
     is_strict = options['strict']
     library_alias = options['alias']
     name = project_data['name']
-    third_party_libs = project_data['deps']
+    deps = project_data['deps']
     brick_imports = report.get_third_party_imports(root, ns, project_data)
     report.print_libs_summary(brick_imports, project_data)
     report.print_libs_in_bricks(brick_imports)
-    library_aliases = alias.parse(library_alias)
-    extra = alias.pick(library_aliases, third_party_libs)
-    libs = third_party_libs.union(extra)
+    libs = distributions.known_aliases_and_sub_dependencies(deps, library_alias)
     return report.print_missing_installed_libs(brick_imports, libs, name, is_strict)

polylith_cli-0.2.0/polylith_cli/polylith/distributions/__init__.py

@@ -0,0 +1,3 @@
+from polylith_cli.polylith.distributions.collect import known_aliases_and_sub_dependencies
+from polylith_cli.polylith.distributions.core import distributions_packages, distributions_sub_packages, get_distributions
+__all__ = ['distributions_packages', 'distributions_sub_packages', 'get_distributions', 'known_aliases_and_sub_dependencies']

polylith_cli-0.2.0/polylith_cli/polylith/distributions/collect.py

@@ -0,0 +1,21 @@
+import importlib.metadata
+from typing import Set
+from polylith_cli.polylith import alias
+from polylith_cli.polylith.distributions.core import distributions_packages, distributions_sub_packages
+
+def known_aliases_and_sub_dependencies(deps: dict, library_alias: list) -> Set[str]:
+    """Collect known aliases (packages) for third-party libraries.
+
+    When the library origin is not from a lock-file:
+    collect sub-dependencies for each library, and append to the result.
+    """
+    third_party_libs = deps['items']
+    lock_file = str.endswith(deps['source'], '.lock')
+    dists = list(importlib.metadata.distributions())
+    dist_packages = distributions_packages(dists)
+    custom_aliases = alias.parse(library_alias)
+    sub_deps = distributions_sub_packages(dists) if not lock_file else {}
+    a = alias.pick(dist_packages, third_party_libs)
+    b = alias.pick(custom_aliases, third_party_libs)
+    c = alias.pick(sub_deps, third_party_libs)
+    return third_party_libs.union(a, b, c)

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/polylith_cli/polylith/distributions/core.py

@@ -1,8 +1,31 @@
 import importlib.metadata
+import re
 from functools import reduce
 from typing import Dict, List
 
 
+SUB_DEP_SEPARATORS = r"[\s!=;><\^~]"
+
+
+def parse_sub_package_name(dependency: str) -> str:
+    parts = re.split(SUB_DEP_SEPARATORS, dependency)
+
+    return str(parts[0])
+
+
+def dist_subpackages(dist) -> dict:
+    name = dist.metadata["name"]
+    dependencies = importlib.metadata.requires(name) or []
+
+    parsed_package_names = list({parse_sub_package_name(d) for d in dependencies})
+
+    return {name: parsed_package_names} if dependencies else {}
+
+
+def map_sub_packages(acc, dist) -> dict:
+    return {**acc, **dist_subpackages(dist)}
+
+
 def top_level_packages(dist) -> List[str]:
     top_level = dist.read_text("top_level.txt")
 
@@ -25,6 +48,11 @@ def distributions_packages(dists) -> Dict[str, List[str]]:
     return reduce(map_packages, dists, {})
 
 
+def distributions_sub_packages(dists) -> Dict[str, List[str]]:
+    """Return the dependencies of each distribution."""
+    return reduce(map_sub_packages, dists, {})
+
+
 def get_distributions(project_dependencies: set) -> list:
     dists = importlib.metadata.distributions()
 

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/polylith_cli/polylith/project/get.py

@@ -1,7 +1,7 @@
 import re
 from functools import lru_cache
 from pathlib import Path
-from typing import List, Set
+from typing import List
 import tomlkit
 from polylith_cli.polylith import repo, workspace
 
@@ -22,13 +22,14 @@ def get_project_name(data) -> str:
         return data['project']['name']
     return data['tool']['poetry']['name']
 
-def get_project_dependencies(data) -> Set:
+def get_project_dependencies(data) -> dict:
     if repo.is_poetry(data):
         deps = data['tool']['poetry'].get('dependencies', [])
-        return set(deps.keys())
+        items = set(deps.keys())
     else:
         deps = data['project'].get('dependencies', [])
-        return {re.split('[\\^~=!<>]', dep)[0] for dep in deps}
+        items = {re.split('[\\^~=!<>]', dep)[0] for dep in deps}
+    return {'items': items, 'source': repo.default_toml}
 
 @lru_cache
 def get_toml(path: Path) -> tomlkit.TOMLDocument:

{polylith_cli-0.1.0 → polylith_cli-0.2.0}/pyproject.toml

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

polylith_cli-0.1.0/polylith_cli/polylith/distributions/__init__.py

@@ -1,2 +0,0 @@
-from polylith_cli.polylith.distributions.core import distributions_packages, get_distributions
-__all__ = ['distributions_packages', 'get_distributions']