From ee548eb16e7ff916b426798d7b79074a9965f12a Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 19 Nov 2024 04:44:43 -0800 Subject: [PATCH] fix archivebox install not using LIB_DIR --- archivebox/pkgs/abx-plugin-npm/abx_plugin_npm/binproviders.py | 2 +- archivebox/pkgs/abx-plugin-pip/abx_plugin_pip/binproviders.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/archivebox/pkgs/abx-plugin-npm/abx_plugin_npm/binproviders.py b/archivebox/pkgs/abx-plugin-npm/abx_plugin_npm/binproviders.py index 400c97c2..72325083 100644 --- a/archivebox/pkgs/abx-plugin-npm/abx_plugin_npm/binproviders.py +++ b/archivebox/pkgs/abx-plugin-npm/abx_plugin_npm/binproviders.py @@ -29,10 +29,10 @@ class LibNpmBinProvider(NpmProvider): LIB_DIR = abx.pm.hook.get_LIB_DIR() self.npm_prefix = LIB_DIR / 'npm' self.PATH = f'{LIB_DIR / "npm" / "node_modules" / ".bin"}:{NEW_NODE_BIN_PATH}:{OLD_NODE_BIN_PATH}' - super().setup() SYS_NPM_BINPROVIDER = SystemNpmBinProvider() LIB_NPM_BINPROVIDER = LibNpmBinProvider() +LIB_NPM_BINPROVIDER.setup() npm = LIB_NPM_BINPROVIDER diff --git a/archivebox/pkgs/abx-plugin-pip/abx_plugin_pip/binproviders.py b/archivebox/pkgs/abx-plugin-pip/abx_plugin_pip/binproviders.py index 44e2c6b2..67a1aaab 100644 --- a/archivebox/pkgs/abx-plugin-pip/abx_plugin_pip/binproviders.py +++ b/archivebox/pkgs/abx-plugin-pip/abx_plugin_pip/binproviders.py @@ -63,9 +63,13 @@ class LibPipBinProvider(PipProvider): super().setup() SYS_PIP_BINPROVIDER = SystemPipBinProvider() +SYS_PIP_BINPROVIDER.setup() PIPX_PIP_BINPROVIDER = SystemPipxBinProvider() +PIPX_PIP_BINPROVIDER.setup() VENV_PIP_BINPROVIDER = VenvPipBinProvider() +VENV_PIP_BINPROVIDER.setup() LIB_PIP_BINPROVIDER = LibPipBinProvider() +LIB_PIP_BINPROVIDER.setup() pip = LIB_PIP_BINPROVIDER # ensure python libraries are importable from these locations (if archivebox wasnt executed from one of these then they wont already be in sys.path)