omlish 0.0.0.dev111__py3-none-any.whl → 0.0.0.dev112__py3-none-any.whl

omlish/.manifests.json

@@ -23,18 +23,6 @@
       }
     }
   },
-  {
-    "module": ".diag.pycharm.cli",
-    "attr": "_CLI_MODULE",
-    "file": "omlish/diag/pycharm/cli.py",
-    "line": 38,
-    "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pycharm",
-        "mod_name": "omlish.diag.pycharm.cli"
-      }
-    }
-  },
   {
     "module": ".formats.json.cli.__main__",
     "attr": "_CLI_MODULE",

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev111'
-__revision__ = 'bb150a1986306450374f5184b47e2658a5b7c656'
+__version__ = '0.0.0.dev112'
+__revision__ = 'b12f9a554e6b2fb475bd820af89e0860c0b46215'
 
 
 #

omlish/diag/{pycharm/pycharm.py → pycharm.py}

@@ -8,14 +8,14 @@ import subprocess
 import sys
 import typing as ta
 
-from ... import check
-from ... import lang
+from .. import check
+from .. import lang
 
 
 if ta.TYPE_CHECKING:
-    docker = lang.proxy_import('...docker')
+    docker = lang.proxy_import('..docker')
 else:
-    from ... import docker
+    from .. import docker
 
 
 ##

omlish/docker/helpers.py

@@ -26,7 +26,7 @@ def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
 DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
 
 
-_LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/docker/')
+_LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/(docker|desktop-containerd)/')
 
 
 def is_likely_in_docker() -> bool:

{omlish-0.0.0.dev111.dist-info → omlish-0.0.0.dev112.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev111
+Version: 0.0.0.dev112
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev111.dist-info → omlish-0.0.0.dev112.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=gvxx_bze4mfSzt-0PMk7AqSogAZ6wFVXsyllG2meSDQ,3352
+omlish/.manifests.json,sha256=CxGnj-UiRPlZgmgWoovDWrOnqpSEmBy_kqA7cdfSA3w,1431
+omlish/__about__.py,sha256=DGyL6xk-FSlgo5rE4puw2-MQAqKILCVboGjEq38_1Ek,3352
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -155,13 +155,11 @@ omlish/diag/debug.py,sha256=YPzQXiBAJMYHYpBKzx0QhlLMZokjR5kkAVLodA3yddQ,424
 omlish/diag/procfs.py,sha256=vBovaMvAUKdl7FbtFq3TNsSmdhs8DaYfhoEsKeWYta8,9704
 omlish/diag/procstats.py,sha256=UkqxREqfd-38xPYZ9T1SIJISz5ARQCEhTtOZrxtm2dE,777
 omlish/diag/ps.py,sha256=1JWxZen3fVG-20R6ZZ8BtO_gpzw_5bhHZiKdoHkgxoU,1004
+omlish/diag/pycharm.py,sha256=7-r_F-whXt8v-0dehxAX-MeMFPM3iZXX9IfeL0GfUtk,4643
 omlish/diag/pydevd.py,sha256=tHI0fc2ZaYKudUWTRuUe5B66qGeNktPC49ZKb8x0rSY,7298
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/diag/_pycharm/runhack.py,sha256=eJlaUXIcFzAjOop_793RwNS_KF9NmhLv0i22xRVVeo0,34951
-omlish/diag/pycharm/__init__.py,sha256=-hZryZ3RfuoH4arwhBl-RmCZ6j-ybuUIEUf9C8o37iY,180
-omlish/diag/pycharm/cli.py,sha256=7SRh6yj8S5YGda4bq9BD4Kzwtgg4_Wa-K202ReZN2iI,1011
-omlish/diag/pycharm/pycharm.py,sha256=Xmh0PyOe51NSI7kYODvhjYCKIqSddyYOAqjx9v6zNlw,4647
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
@@ -175,7 +173,7 @@ omlish/dispatch/methods.py,sha256=XHjwwC9Gn4iDWxbyLAcbdSwRgVaq-8Bnn5cAwf5oZdA,54
 omlish/docker/__init__.py,sha256=dmda-4zBo0UM_CMws_1MOwtyObdF79LB0HF5IT3sDVk,482
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
 omlish/docker/compose.py,sha256=4drmnGQzbkOFJ9B6XSg9rnXkJeZz1ETmdcMe1PE790U,1237
-omlish/docker/helpers.py,sha256=j2eZIqIUpy34ZmoGyIzsYuKx9HeewwYBfrGNC99EFYk,928
+omlish/docker/helpers.py,sha256=4gd82lpFh5bQFmKOkxgVU-QyuDcGR4341qW75UcFiX0,949
 omlish/docker/hub.py,sha256=7LIuJGdA-N1Y1dmo50ynKM1KUTcnQM_5XbtPbdT_QLU,3940
 omlish/docker/manifests.py,sha256=LR4FpOGNUT3bZQ-gTjB6r_-1C3YiG30QvevZjrsVUQM,7068
 omlish/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -469,9 +467,9 @@ omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,329
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev111.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev111.dist-info/METADATA,sha256=NOhma2BjhNWfdWwTjNisoW2NP0V3sJ2Fi75u2-IF2UE,4000
-omlish-0.0.0.dev111.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-omlish-0.0.0.dev111.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev111.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev111.dist-info/RECORD,,
+omlish-0.0.0.dev112.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev112.dist-info/METADATA,sha256=INYzO7o12uhwfL_sfYgGb5QZrhHz6hTkQq8eby0_zrY,4000
+omlish-0.0.0.dev112.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+omlish-0.0.0.dev112.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev112.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev112.dist-info/RECORD,,

omlish/diag/pycharm/__init__.py

@@ -1,7 +0,0 @@
-from .pycharm import (  # noqa
-    PycharmRemoteDebugger,
-    get_pycharm_version,
-    is_pycharm_hosted,
-    pycharm_remote_debugger_attach,
-    read_darwin_pycharm_info_plist,
-)

omlish/diag/pycharm/cli.py

@@ -1,46 +0,0 @@
-import inspect
-import os.path
-import subprocess
-import tempfile
-
-from ... import argparse as ap
-from .pycharm import get_pycharm_version
-
-
-class Cli(ap.Cli):
-    @ap.command()
-    def version(self) -> None:
-        print(get_pycharm_version())
-
-    @ap.command(
-        ap.arg('python-exe'),
-        ap.arg('args', nargs=ap.REMAINDER),
-    )
-    def runhack(self) -> int:
-        if not os.path.isfile(exe := self.args.python_exe):
-            raise FileNotFoundError(exe)
-
-        from .._pycharm import runhack
-        src = inspect.getsource(runhack)
-
-        src_file = tempfile.mktemp(__package__ + '-runhack')  # noqa
-        with open(src_file, 'w') as f:
-            f.write(src)
-
-        proc = subprocess.run([exe, src_file, *self.args.args], check=False)
-        return proc.returncode
-
-
-def _main() -> None:
-    Cli().call_and_exit()
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'pycharm',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    _main()