omlish 0.0.0.dev59__tar.gz → 0.0.0.dev60__tar.gz

{omlish-0.0.0.dev59/omlish.egg-info → omlish-0.0.0.dev60}/PKG-INFO

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

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/omlish/.manifests.json

@@ -27,7 +27,7 @@
     "module": ".diag.pycharm",
     "attr": "_CLI_MODULE",
     "file": "omlish/diag/pycharm.py",
-    "line": 138,
+    "line": 141,
     "value": {
       "$omdev.cli.types.CliModule": {
         "cmd_name": "pycharm",

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev59'
-__revision__ = 'ecad0399fc2d42f679cc344ed7e3c8fd556025ef'
+__version__ = '0.0.0.dev60'
+__revision__ = 'eb96b2408cdf5b153541f194ea5ab7bba1c2524b'
 
 
 #

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/omlish/diag/pycharm.py

@@ -27,11 +27,11 @@ def is_pycharm_hosted() -> bool:
 ##
 
 
-PYCHARM_HOME = '/Applications/PyCharm.app'
+DARWIN_PYCHARM_HOME = '/Applications/PyCharm.app'
 
 
-def read_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
-    plist_file = os.path.join(PYCHARM_HOME, 'Contents', 'Info.plist')
+def read_darwin_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
+    plist_file = os.path.join(DARWIN_PYCHARM_HOME, 'Contents', 'Info.plist')
     if not os.path.isfile(plist_file):
         return None
 
@@ -43,13 +43,17 @@ def read_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
 
 @lang.cached_function
 def get_pycharm_version() -> str | None:
-    plist = read_pycharm_info_plist()
-    if plist is None:
-        return None
+    if sys.platform == 'darwin':
+        plist = read_darwin_pycharm_info_plist()
+        if plist is None:
+            return None
+
+        ver = check.non_empty_str(plist['CFBundleVersion'])
+        check.state(ver.startswith('PY-'))
+        return ver[3:]
 
-    ver = check.non_empty_str(plist['CFBundleVersion'])
-    check.state(ver.startswith('PY-'))
-    return ver[3:]
+    else:
+        return None
 
 
 ##
@@ -108,10 +112,6 @@ def pycharm_remote_debugger_attach(
         *,
         version: str | None = None,
 ) -> None:
-    # if version is None:
-    #     version = get_pycharm_version()
-    # check.non_empty_str(version)
-
     if host is None:
         if (
                 sys.platform == 'linux' and
@@ -122,6 +122,9 @@ def pycharm_remote_debugger_attach(
         else:
             host = 'localhost'
 
+    if version is None and host in ('localhost', '127.0.0.1'):
+        version = get_pycharm_version()
+
     if ta.TYPE_CHECKING:
         import pydevd_pycharm  # noqa
     else:

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/omlish/diag/replserver/server.py

@@ -2,6 +2,7 @@
 FIXME:
  - lol shutdown deadlocks
  - whole thing is just gross is this its own thread or what
+ - cli with client helper too
 
 TODO:
  - !!! ANYIO !!!

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/omlish/libc.py

@@ -1,7 +1,4 @@
-# ruff: noqa: ANN201
-# ruff: noqa: N801
-# ruff: noqa: N802
-
+# ruff: noqa: ANN201, N801, N802
 import ctypes as ct
 import errno
 import platform
@@ -213,7 +210,14 @@ class Mmap:
         return self._base
 
     def __enter__(self) -> 'Mmap':
-        base = mmap(self._desired_base, self._length, self._prot, self._flags, self._fd, self._offset)
+        base = mmap(
+            self._desired_base,
+            self._length,
+            self._prot,
+            self._flags,
+            self._fd,
+            self._offset,
+        )
         if base == MAP_FAILED:
             err, msg = lasterr()
             raise OSError(err, 'mmap failed: ' + msg)

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev59 → omlish-0.0.0.dev60}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev59'
+version = '0.0.0.dev60'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',