[~] Refactor

This commit is contained in:
Siarhei Siniak 2024-12-03 09:17:16 +03:00
parent d38022b5a6
commit 92966ca86d
5 changed files with 45 additions and 11 deletions

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

@ -1 +1 @@
Subproject commit adef10a8c41f5c550622879370a40f8a9e545574 Subproject commit 6731afb205b69f65f1adf625f6e81ae972218987

@ -99,5 +99,30 @@
"key": "alt+r", "key": "alt+r",
"command": "-toggleSearchEditorRegex", "command": "-toggleSearchEditorRegex",
"when": "inSearchEditor && searchInputBoxFocus" "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"
} }
] ]

@ -2,5 +2,6 @@
"editor.wordWrap": "on", "editor.wordWrap": "on",
"editor.minimap.autohide": true, "editor.minimap.autohide": true,
"editor.minimap.maxColumn": 80, "editor.minimap.maxColumn": 80,
"editor.minimap.size": "fit" "editor.minimap.size": "fit",
"diffEditor.hideUnchangedRegions.enabled": true
} }

@ -1,8 +1,12 @@
import logging 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( logging.basicConfig(
level=logging.INFO, level=level,
format=( format=(
'%(levelname)s:%(name)s:%(message)s' '%(levelname)s:%(name)s:%(message)s'
':%(process)d' ':%(process)d'