omdev 0.0.0.dev491__tar.gz → 0.0.0.dev492__tar.gz

{omdev-0.0.0.dev491/omdev.egg-info → omdev-0.0.0.dev492}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev491
+Version: 0.0.0.dev492
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev491
+Requires-Dist: omlish==0.0.0.dev492
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/ci/cli.py

@@ -22,7 +22,7 @@ from omlish.argparse.cli import argparse_cmd
 from omlish.lite.check import check
 from omlish.lite.inject import inj
 from omlish.logs.modules import get_module_logger
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .cache import DirectoryFileCache
 from .ci import Ci

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/dataclasses/cli.py

@@ -1,5 +1,5 @@
 from omlish.argparse import all as ap
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .codegen import DataclassCodeGen
 

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/interp/cli.py

@@ -17,7 +17,7 @@ from omlish.lite.check import check
 from omlish.lite.inject import Injector
 from omlish.lite.inject import inj
 from omlish.lite.runtime import check_lite_runtime_version
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .inject import bind_interp
 from .resolvers import InterpResolver

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/manifests/main.py

@@ -5,7 +5,7 @@ import multiprocessing as mp
 import os.path
 
 from omlish.lite.json import json_dumps_pretty
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .building import ManifestBuilder
 from .building import check_package_manifests

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/packaging/revisions.py

@@ -15,7 +15,7 @@ import zipfile
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.logs.modules import get_module_logger
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from ..git.revisions import get_git_revision
 from .wheelfile import WheelFile

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/py/tools/pipdepup.py

@@ -510,18 +510,12 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
     """Convert the package data into something usable by output_package_listing_columns."""
 
     header = [
-        ' ',
-
         'Package',
         'Current',
 
-        ' ',
-
         'Suggested',
         'Age',
 
-        ' ',
-
         'Latest',
         'Age',
     ]
@@ -542,41 +536,40 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
     # if has_editables:
     #     header.append('Editable project location')
 
-    data = []
-    for proj in pkgs:
-        sc = check.not_none(proj.suggested_candidate)
-        lc = check.not_none(proj.latest_candidate)
+    rows = []
+    for pkg in pkgs:
+        sc = check.not_none(pkg.suggested_candidate)
+        lc = check.not_none(pkg.latest_candidate)
 
         row = [
-            '*' if lc is not sc else '',
-
-            proj.dist.raw_name,
-            proj.dist.raw_version,
+            pkg.dist.raw_name,
+            pkg.dist.raw_version,
         ]
 
-        for c in [sc, lc]:
-            row.extend([
-                '|',
+        def add_c(c):
+            if c is None:
+                row.extend(['', ''])
+                return
 
-                str(c.version),
-            ])
+            row.append(str(c.version))
 
             if (l_ut := c.upload_time()) is not None:
                 row.append(human_round_td(now_utc() - l_ut))
             else:
                 row.append('')
 
-            # row.append(c.filetype)
+        add_c(sc if sc.version != pkg.dist.version else None)
+        add_c(lc if sc is not lc else None)
 
         # if has_build_tags:
         #     row.append(build_tags[i] or '')
 
         # if has_editables:
-        #     row.append(proj.dist.editable_project_location or '')
+        #     row.append(pkg.dist.editable_project_location or '')
 
-        data.append(row)
+        rows.append(row)
 
-    return data, header
+    return rows, header
 
 
 def _tabulate(

{omdev-0.0.0.dev491 → omdev-0.0.0.dev492}/omdev/pyproject/cli.py

@@ -40,7 +40,7 @@ from omlish.formats.toml.parser import toml_loads
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.runtime import check_lite_runtime_version
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer