From 27af208437b490affd7a12fd7ed1c028af0374d7 Mon Sep 17 00:00:00 2001
From: Siarhei Siniak <siarheisiniak@gmail.com>
Date: Sun, 24 Nov 2024 22:35:54 +0300
Subject: [PATCH] [~] Refactor
---
Makefile | 12 +++++++++---
_m.py | 5 ++++-
deps/com.github.aiortc.aiortc | 2 +-
dotfiles/.local/bin/commands | 1 +
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 52a8b92..cb02f73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,20 @@
+.PHONY: python_clean_online_fxreader_vpn
+
host_deps:
./m host_deps
-python_clean:
+python_clean_online_fxreader_vpn:
+ rm -fr \
+ deps/com.github.aiortc.aiortc/src/online_fxreader/vpn/dist;
+
+python_clean: python_clean_online_fxreader_vpn
rm -fr \
~/.local/bin/env3 \
deps/com.github.aiortc.aiortc/dist \
deps/com.github.aiortc.aiortc/src/online_fxreader/vpn/dist;
python_put:
- [[ -f ~/.local/bin/env3 ]] || (\
+ [[ -d ~/.local/bin/env3 ]] || (\
uv venv --system-site-packages --seed ~/.local/bin/env3 && \
~/.local/bin/env3/bin/python3 -m pip install uv \
);
@@ -16,7 +22,7 @@ python_put:
deps/com.github.aiortc.aiortc/ \
deps/com.github.aiortc.aiortc/src/online_fxreader/vpn; do \
echo $$f; \
- [[ -f $$f/dist ]] && continue; \
+ [[ -d $$f/dist ]] && continue; \
python3 -m build --installer uv $$f; \
~/.local/bin/env3/bin/python3 -m uv pip install $$f/dist/*.whl; \
done
diff --git a/_m.py b/_m.py
index 46c0766..f2ecc4d 100644
--- a/_m.py
+++ b/_m.py
@@ -224,7 +224,10 @@ def mypy(argv: list[str]) -> None:
h = {
k : len(v)
- for k, v in g.items()
+ for k, v in sorted(
+ list(g.items()),
+ key=lambda x: x[0],
+ )
}
if options.format == MypyFormat.vscode:
diff --git a/deps/com.github.aiortc.aiortc b/deps/com.github.aiortc.aiortc
index 4aed4f1..241b7ad 160000
--- a/deps/com.github.aiortc.aiortc
+++ b/deps/com.github.aiortc.aiortc
@@ -1 +1 @@
-Subproject commit 4aed4f16309082285e27082ea52ee2251e8159c6
+Subproject commit 241b7adf7900533d552507419f1d0e2807c9bbb6
diff --git a/dotfiles/.local/bin/commands b/dotfiles/.local/bin/commands
index c89215d..7e68ac4 100755
--- a/dotfiles/.local/bin/commands
+++ b/dotfiles/.local/bin/commands
@@ -1590,6 +1590,7 @@ def vpn(argv: list[str]) -> None:
subprocess.check_call([
'sudo',
*python_path,
+ '-B',
'-m',
'online_fxreader.vpn.vpn',
*argv,