.gitignore

@@ -10,5 +10,4 @@ d2/book1/books
 *.egg-info
 *.whl
 *.tar.gz
-.vscode/*
+.code
-!.vscode/launch.json

.vscode/launch.json

@@ -1,49 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        /*
-        {
-            "name": "Python Debugger: Module",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "online_fxreader.vpn.vpn",
-        },
-        {
-            "name": "Python Debugger: Current File with Arguments",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal",
-            "args": [
-                "${command:pickArgs}"
-            ]
-        },
-        */
-        {
-            "name": "Python Debugger: Remote Attach",
-            "type": "debugpy",
-            "request": "attach",
-            "connect": {
-                "host": "127.0.0.1",
-                "port": 4444
-            },
-            "pathMappings": [
-                /*
-                {
-                    "localRoot": "${workspaceFolder}/deps/com.github.aiortc.aiortc/src/",
-                    //"remoteRoot": "."
-                    "remoteRoot": "~/.local/bin/env3/lib/python3.12/site-packages/",
-                },
-                {
-                    "localRoot": "${workspaceFolder}/deps/com.github.aiortc.aiortc/",
-                    //"remoteRoot": "."
-                    "remoteRoot": "~/.local/bin/env3/lib/python3.12/site-packages/",
-                }
-                */
-            ]
-        }
-    ]
-}

Makefile

@@ -22,12 +22,6 @@ python_clean_env:
 	rm -fr \
 		$(INSTALL_ROOT)/env3;
 
-python_put_env:
-	[[ -d $(INSTALL_ROOT)/env3 ]] || (\
-		uv venv --system-site-packages --seed $(INSTALL_ROOT)/env3 && \
-		$(INSTALL_ROOT)/env3/bin/python3 -m pip install uv \
-	);
-
 python_clean_dist:
 	for o in $(PYTHON_PROJECTS); do \
 		[[ -d $$o/dist ]] || continue; \
@@ -37,18 +31,20 @@ python_clean_dist:
 
 python_clean: python_clean_dist python_clean_env
 
-python_put_dist:
+python_put:
+	[[ -d $(INSTALL_ROOT)/env3 ]] || (\
+		uv venv --system-site-packages --seed $(INSTALL_ROOT)/env3 && \
+		$(INSTALL_ROOT)/env3/bin/python3 -m pip install uv \
+	);
 	for f in \
 		$(PYTHON_PROJECTS); do \
 		[[ -d $$f/dist ]] && continue; \
 		echo $$f; \
-		python3 -m build -n $$f; \
+		python3 -m build --installer uv $$f; \
-		$(INSTALL_ROOT)/env3/bin/python3 -m uv pip install --offline $$f/dist/*.whl; \
+		$(INSTALL_ROOT)/env3/bin/python3 -m uv pip install $$f/dist/*.whl; \
 	done
 	ln -sf $(INSTALL_ROOT)/env3/bin/online-fxreader-pr34-commands $(INSTALL_ROOT)/commands
 
-python_put: python_put_dist python_put_env
-
 dotfiles_put:
 	mkdir -p $(INSTALL_ROOT)
 	cp dotfiles/.local/bin/gnome-shortcuts-macbook-air $(INSTALL_ROOT)/

deps/com.github.aiortc.aiortc

@@ -1 +1 @@
-Subproject commit 1c8f054d29bfa9dae897f6101f95e8eb4f920305
+Subproject commit adef10a8c41f5c550622879370a40f8a9e545574

dotfiles/.config/Code - OSS/User/keybindings.json

@@ -99,30 +99,5 @@
         "key": "alt+r",
         "command": "-toggleSearchEditorRegex",
         "when": "inSearchEditor && searchInputBoxFocus"
-    },
-    {
-        "key": "ctrl+/",
-        "command": "-editor.action.accessibleViewAcceptInlineCompletion",
-        "when": "accessibleViewIsShown && accessibleViewCurrentProviderId == 'inlineCompletions'"
-    },
-    {
-        "key": "ctrl+k ctrl+/",
-        "command": "-editor.foldAllBlockComments",
-        "when": "editorTextFocus && foldingEnabled"
-    },
-    {
-        "key": "ctrl+/",
-        "command": "-toggleExplainMode",
-        "when": "suggestWidgetVisible"
-    },
-    {
-        "key": "ctrl+/",
-        "command": "-workbench.action.chat.attachContext",
-        "when": "inChatInput && chatLocation == 'editing-session' || inChatInput && chatLocation == 'editor' || inChatInput && chatLocation == 'notebook' || inChatInput && chatLocation == 'panel' || inChatInput && chatLocation == 'terminal'"
-    },
-    {
-        "key": "ctrl+/",
-        "command": "-workbench.action.terminal.sendSequence",
-        "when": "terminalFocus"
     }
 ]

dotfiles/.config/Code - OSS/User/settings.json

@@ -2,8 +2,5 @@
     "editor.wordWrap": "on",
     "editor.minimap.autohide": true,
     "editor.minimap.maxColumn": 80,
-    "editor.minimap.size": "fit",
+    "editor.minimap.size": "fit"
-    "diffEditor.hideUnchangedRegions.enabled": true,
-    "python.experiments.enabled": false,
-    "debugpy.debugJustMyCode": false
 }

python/online/fxreader/pr34/commands.py

@@ -1625,7 +1625,6 @@ def vpn(argv: list[str]) -> None:
         'sudo',
         *python_path,
         '-B',
-        '-Xfrozen_modules=off',
         '-m',
         'online_fxreader.vpn.vpn',
         *argv,

python/online/fxreader/pr34/commands_typed/debug.py

@@ -1,35 +0,0 @@
-import os
-import logging
-
-from typing import (Optional,)
-
-logger = logging.getLogger(__name__)
-
-class DebugPy:
-    @classmethod
-    def set_trace(
-        cls,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        wait: Optional[bool] = None,
-    ) -> None:
-        if host is None:
-            host = '127.0.0.1'
-        if port is None:
-            port = 4444
-        if wait is None:
-            wait = True
-
-        import debugpy
-
-        if os.environ.get('DEBUGPY_RUNNING') != 'true':
-            logger.info('debugpy init')
-            import debugpy
-            debugpy.listen((host, port))
-            os.environ['DEBUGPY_RUNNING'] = 'true'
-
-            if wait:
-                debugpy.wait_for_client()
-                debugpy.breakpoint()
-
-            logger.info('debugpy done')

python/online/fxreader/pr34/commands_typed/logging.py

@@ -1,12 +1,8 @@
 import logging
-from typing import (Optional,)
-
-def setup(level: Optional[int] = None) -> None:
-    if level is None:
-        level = logging.INFO
 
+def setup() -> None:
     logging.basicConfig(
-        level=level,
+        level=logging.INFO,
         format=(
             '%(levelname)s:%(name)s:%(message)s'
             ':%(process)d'

python/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = 'online.fxreader.pr34'
-version = '0.1.1'
+version = '0.1'
 
 dependencies = [
     #"-r requirements.txt",