omdev 0.0.0.dev459__py3-none-any.whl → 0.0.0.dev460__py3-none-any.whl

omdev/__about__.py

@@ -44,7 +44,7 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 14.2',
-            'textual ~= 6.2',
+            'textual ~= 6.3',
         ],
     }
 

omdev/precheck/imports.py

@@ -3,6 +3,8 @@ import dataclasses as dc
 import os.path
 import typing as ta
 
+from omlish.text.filecache import TextFileCache
+
 from .base import Precheck
 from .base import PrecheckContext
 from .caches import AstCache
@@ -26,6 +28,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
             dir_walk_cache: DirWalkCache,
             headers_cache: HeadersCache,
             ast_cache: AstCache,
+            text_file_cache: TextFileCache,
     ) -> None:
         super().__init__(config)
 
@@ -34,6 +37,7 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
         self._dir_walk_cache = dir_walk_cache
         self._headers_cache = headers_cache
         self._ast_cache = ast_cache
+        self._text_file_cache = text_file_cache
 
     async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation]:
         if isinstance(header_lines := self._headers_cache.get_file_headers(py_file), Exception):
@@ -41,11 +45,20 @@ class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
         if any(hl.src.strip() == '# ruff: noqa' for hl in header_lines):
             return
 
+        py_file_lines = self._text_file_cache.get_entry(py_file).lines()
+
         py_file_ast = self._ast_cache.get_file_ast(py_file)
         if not isinstance(py_file_ast, ast.Module):
             return
 
-        for cur_node in py_file_ast.body:
+        for cur_node in ast.walk(py_file_ast):
+            if not isinstance(cur_node, (ast.Import, ast.ImportFrom)):
+                continue
+
+            # FIXME: lame lol
+            if py_file_lines[cur_node.lineno - 1].strip().endswith('# noqa'):
+                continue
+
             if isinstance(cur_node, ast.Import):
                 imp_alias: ast.alias
                 for imp_alias in cur_node.names:

omdev/precheck/main.py

@@ -134,12 +134,12 @@ def _check_cmd(args) -> None:
 
 def _build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser()
+    parser.add_argument('-v', '--verbose', action='store_true')
 
     subparsers = parser.add_subparsers()
 
     parser_check = subparsers.add_parser('check')
     parser_check.add_argument('roots', nargs='+')
-    parser_check.add_argument('-v', '--verbose', action='store_true')
     parser_check.set_defaults(func=_check_cmd)
 
     return parser

{omdev-0.0.0.dev459.dist-info → omdev-0.0.0.dev460.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev459
+Version: 0.0.0.dev460
 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.dev459
+Requires-Dist: omlish==0.0.0.dev460
 Provides-Extra: all
 Requires-Dist: black~=25.9; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,7 @@ Requires-Dist: mypy~=1.18; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.2; extra == "all"
+Requires-Dist: textual~=6.3; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.9; extra == "black"
 Provides-Extra: c
@@ -46,7 +46,7 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.2; extra == "tui"
+Requires-Dist: textual~=6.3; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev459.dist-info → omdev-0.0.0.dev460.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omdev/.omlish-manifests.json,sha256=YqhbZs4Wr3L9DAwcFfhTs8Zw8W8MxPLaxYXp2aqbyzQ,11671
-omdev/__about__.py,sha256=KX4E42jpPT_XtFyoPab3oVQM6Jlq_okC9KLeIOL282w,1223
+omdev/__about__.py,sha256=TwPTq6a1_K0K-oDBQf6x2VmkiD5hi6W8Q7CvmTW9Aic,1223
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
 omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
@@ -219,9 +219,9 @@ omdev/precheck/base.py,sha256=fKdrfakq2u1UU1_JZFnl-non9bIAZMsSkVY1SMYn8xQ,662
 omdev/precheck/blanklines.py,sha256=VG06NTcFoJjUBn46OXlx4qf5u3vx5l02XiNANBeuQBY,1882
 omdev/precheck/caches.py,sha256=OZKP20DIj6OpUzdNwrjCufv1GzndEbsc7tLD-qHNv9g,1736
 omdev/precheck/git.py,sha256=O8rNQZ_vlHec0pOFbK6LOkbly5ZIUYT_HXRMqQX8GaI,774
-omdev/precheck/imports.py,sha256=3loQxHMrpI0ce4-le77NCSxutLac_5vDW4UDX7KWWg8,2565
+omdev/precheck/imports.py,sha256=KXNFCqDqBRUzRs1LFvKVSNDhoVWtNibFbmcqGPrqx9c,3016
 omdev/precheck/lite.py,sha256=sseaKHMZgMhIEuifZvPJm0-wuRqRUrnyySJfHBMItOM,4737
-omdev/precheck/main.py,sha256=hbCouy3Lh1hFmQxktQz-_-LhlT3fnXXFoJhzT_rKX9M,4445
+omdev/precheck/main.py,sha256=wwghmR8S17GpC5Jil3yg96LsIGUKH29HS0h2d4YZ8f0,4439
 omdev/precheck/manifests.py,sha256=dxl7GSJHKjQrR6mbwvj6j92XDGHOpxxEEQ6smJkBEe4,810
 omdev/precheck/scripts.py,sha256=6nb_lDgyX7u9kdF_BU6ubY01q_jGk96VH9q9gpOieng,1753
 omdev/precheck/unicode.py,sha256=vMxGb4Kqg1NhFlw1kbgsPtXOnswjREH0ZPZExrrTwCU,3260
@@ -315,9 +315,9 @@ omdev/tui/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tui/apps/markdown/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tui/apps/markdown/__main__.py,sha256=Xy-G2-8Ymx8QMBbRzA4LoiAMZqvtC944mMjFEWd69CA,182
 omdev/tui/apps/markdown/cli.py,sha256=ubm4UsMbkAvwsjxbQ82kxo1ku4657YLMQ1NVXv0DuRo,506
-omdev-0.0.0.dev459.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev459.dist-info/METADATA,sha256=1LN43hOrFtV8XS-nF6NzPYuPqKRJSzIq8TVRvIMhLj8,5170
-omdev-0.0.0.dev459.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev459.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev459.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev459.dist-info/RECORD,,
+omdev-0.0.0.dev460.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev460.dist-info/METADATA,sha256=Lf305_2gbqTzrg_NexxTd14ADMAYGl1opL-tuV5_5Yo,5170
+omdev-0.0.0.dev460.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev460.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev460.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev460.dist-info/RECORD,,