diff --git a/Makefile b/Makefile index a7e0d1a..6f6ccfd 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ python_clean_env: 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 \ + $(INSTALL_ROOT)/env3/bin/python3 -m pip install --force-reinstall uv \ ); python_clean_dist: @@ -37,13 +37,14 @@ python_clean_dist: python_clean: python_clean_dist python_clean_env +UV_ARGS ?= --offline python_put_dist: for f in \ $(PYTHON_PROJECTS); do \ [[ -d $$f/dist ]] && continue; \ echo $$f; \ python3 -m build -n $$f; \ - $(INSTALL_ROOT)/env3/bin/python3 -m uv pip install --offline $$f/dist/*.whl; \ + $(INSTALL_ROOT)/env3/bin/python3 -m uv pip install $(UV_ARGS) $$f/dist/*.whl; \ done ln -sf $(INSTALL_ROOT)/env3/bin/online-fxreader-pr34-commands $(INSTALL_ROOT)/commands diff --git a/deps/online.fxreader.nartes.books b/deps/online.fxreader.nartes.books index 7cc5953..41006e6 160000 --- a/deps/online.fxreader.nartes.books +++ b/deps/online.fxreader.nartes.books @@ -1 +1 @@ -Subproject commit 7cc59533c0eddbe04e3b58109d1d861a6f92f40d +Subproject commit 41006e6e73c710c0b78d1fbb37b149579dad34f0 diff --git a/python/online/fxreader/pr34/commands.py b/python/online/fxreader/pr34/commands.py index dfc8be0..54d248c 100644 --- a/python/online/fxreader/pr34/commands.py +++ b/python/online/fxreader/pr34/commands.py @@ -2542,7 +2542,6 @@ def desktop_services(argv): class Cpufreq: @classmethod - @property def profile(cls) -> Literal['applesmc.768']: if os.path.exists('/sys/bus/platform/devices/applesmc.768'): return 'applesmc.768' @@ -2551,7 +2550,7 @@ def desktop_services(argv): @classmethod def powersave(cls): - if cls.profile == 'applesmc.768': + if cls.profile() == 'applesmc.768': subprocess.check_call(r''' echo performance | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; echo powersave | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; @@ -2563,7 +2562,7 @@ echo 2000 > /sys/bus/platform/devices/applesmc.768/fan1_output; @classmethod def performance(cls): - if cls.profile == 'applesmc.768': + if cls.profile() == 'applesmc.768': subprocess.check_call(r''' echo powersave | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; echo performance | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; @@ -3981,4 +3980,4 @@ def commands_cli( if __name__ == '__main__': - sys.exit(commands_cli()) \ No newline at end of file + sys.exit(commands_cli())