omdev 0.0.0.dev118__py3-none-any.whl → 0.0.0.dev120__py3-none-any.whl

omdev/pycharm/cli.py

@@ -16,7 +16,7 @@ from omlish.diag.pycharm import get_pycharm_version
 
 
 _DARWIN_OPEN_SCRIPT = """
-tell application "PyCharm"
+tell application "{app}"
     activate
     open "{dir}"
 end tell
@@ -29,6 +29,7 @@ _LINUX_OPEN_SCRIPT = """
 
 # wmctrl -lx
 # 0x03000054  0 jetbrains-pycharm.jetbrains-pycharm  spinlock-ws omlish - cli.py
+# 0x0480004c  0 jetbrains-clion.jetbrains-clion  spinlock-ws cpython - ceval.c
 # wmctrl -i -a 0x03000054
 
 if pgrep -x "pycharm.sh" > /dev/null; then
@@ -68,6 +69,7 @@ class Cli(ap.Cli):
 
     @ap.command(
         ap.arg('dir', nargs='?'),
+        ap.arg('--clion', action='store_true'),
     )
     def open(self) -> None:
         dir = os.path.abspath(self.args.dir or '.')  # noqa
@@ -76,7 +78,10 @@ class Cli(ap.Cli):
             if '"' in dir:
                 raise ValueError(dir)
 
-            scpt_src = _DARWIN_OPEN_SCRIPT.format(dir=dir)
+            scpt_src = _DARWIN_OPEN_SCRIPT.format(
+                app='CLion' if self.args.clion else 'PyCharm',
+                dir=dir,
+            )
 
             scpt_file = tempfile.mktemp(__package__ + '-pycharm-open')  # noqa
             with open(scpt_file, 'w') as f:

omdev/pyproject/cli.py

@@ -155,7 +155,7 @@ class Venv:
             *(['uv'] if uv else []),
         )
 
-        if (sr := self._cfg.requires):
+        if sr := self._cfg.requires:
             rr = RequirementsRewriter(self._name)
             reqs = [rr.rewrite(req) for req in sr]
 

omdev/scripts/interp.py

@@ -1302,7 +1302,7 @@ class StandardLogFormatter(logging.Formatter):
         if datefmt:
             return ct.strftime(datefmt)  # noqa
         else:
-            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            t = ct.strftime('%Y-%m-%d %H:%M:%S')
             return '%s.%03d' % (t, record.msecs)
 
 
@@ -1439,6 +1439,7 @@ def configure_standard_logging(
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
+        handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
 ) -> ta.Optional[StandardLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -1452,7 +1453,10 @@ def configure_standard_logging(
 
         #
 
-        handler = logging.StreamHandler()
+        if handler_factory is not None:
+            handler = handler_factory()
+        else:
+            handler = logging.StreamHandler()
 
         #
 

omdev/scripts/pyproject.py

@@ -2825,7 +2825,7 @@ class StandardLogFormatter(logging.Formatter):
         if datefmt:
             return ct.strftime(datefmt)  # noqa
         else:
-            t = ct.strftime("%Y-%m-%d %H:%M:%S")  # noqa
+            t = ct.strftime('%Y-%m-%d %H:%M:%S')
             return '%s.%03d' % (t, record.msecs)
 
 
@@ -2962,6 +2962,7 @@ def configure_standard_logging(
         json: bool = False,
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
+        handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
 ) -> ta.Optional[StandardLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -2975,7 +2976,10 @@ def configure_standard_logging(
 
         #
 
-        handler = logging.StreamHandler()
+        if handler_factory is not None:
+            handler = handler_factory()
+        else:
+            handler = logging.StreamHandler()
 
         #
 
@@ -5750,7 +5754,7 @@ class Venv:
             *(['uv'] if uv else []),
         )
 
-        if (sr := self._cfg.requires):
+        if sr := self._cfg.requires:
             rr = RequirementsRewriter(self._name)
             reqs = [rr.rewrite(req) for req in sr]
 

{omdev-0.0.0.dev118.dist-info → omdev-0.0.0.dev120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev118
+Version: 0.0.0.dev120
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev118
+Requires-Dist: omlish ==0.0.0.dev120
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'

{omdev-0.0.0.dev118.dist-info → omdev-0.0.0.dev120.dist-info}/RECORD

@@ -109,11 +109,11 @@ omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ptk/apps/ncdu.py,sha256=dOkEJoc2Wjv1u_Uge7Vpei_LvXldoPP5833Eia355tc,4548
 omdev/pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pycharm/__main__.py,sha256=hUPp11D024eMdT86BxXiRVtF7AGBk5W6Zn8_mEHSksY,163
-omdev/pycharm/cli.py,sha256=gfAgBL3REb3hmtRRRck18mCDGwQQ4kDLhYuP1CP66rY,2478
+omdev/pycharm/cli.py,sha256=13q3ShvRlm6PDnLEzAuNJCafw5xLQOWd2lH2hy31wdA,2697
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/cli.py,sha256=U2pOOqXvqw8RbdcgKryv-MUeHT6QqSwL-dhnDjgyz0U,11340
+omdev/pyproject/cli.py,sha256=V3vxC_VSTuad3kUtLKOi0wGcJlSJPhrxBaXEcb2kE9g,11338
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
 omdev/pyproject/pkg.py,sha256=WB9k3zEpHSAR24H09kikgAnLMWUz-bk9f0aB-2L_ITw,14560
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
@@ -122,8 +122,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
-omdev/scripts/interp.py,sha256=U6mU2RPZjwcBhn4Vl4SrAyDUFcf7bBxBnPY5FHCxosw,72496
-omdev/scripts/pyproject.py,sha256=a1qGCJCkvvZX-cwlqVOsf2kBaBRqQIEb9fQN-zEhH_Y,173571
+omdev/scripts/interp.py,sha256=GM6VrG1Wd1vfwbAJr7fartN7hER_mnJknyX65o3jhkk,72665
+omdev/scripts/pyproject.py,sha256=x7gsWZ8h1gZ3Y_31-cKpOeT_uafAHPxFGdwxjh7Ha-I,173738
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -143,9 +143,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev118.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev118.dist-info/METADATA,sha256=H12RA_-fvdbRBsDbFu-mOIkcG441cIkr1xCCh8S_4Es,1810
-omdev-0.0.0.dev118.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-omdev-0.0.0.dev118.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev118.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev118.dist-info/RECORD,,
+omdev-0.0.0.dev120.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev120.dist-info/METADATA,sha256=_EKIVacZqRgQDdQ5_usv_9GmkNdjXOGCSyGB5FssZyY,1810
+omdev-0.0.0.dev120.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+omdev-0.0.0.dev120.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev120.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev120.dist-info/RECORD,,