Merge branch 'newchanges' into dev

This commit is contained in:
Nick Sweeting
2024-11-19 05:28:20 -08:00
6 changed files with 75 additions and 105 deletions

View File

@@ -12,6 +12,9 @@ from abx_pkg import (
apt = APT_BINPROVIDER = AptProvider()
brew = BREW_BINPROVIDER = BrewProvider()
env = ENV_BINPROVIDER = EnvProvider()
apt.setup()
brew.setup()
env.setup()
@abx.hookimpl(tryfirst=True)

View File

@@ -36,3 +36,6 @@ SYS_NPM_BINPROVIDER = SystemNpmBinProvider()
LIB_NPM_BINPROVIDER = LibNpmBinProvider()
LIB_NPM_BINPROVIDER.setup()
npm = LIB_NPM_BINPROVIDER
LIB_NPM_BINPROVIDER.setup()
SYS_NPM_BINPROVIDER.setup()

View File

@@ -72,6 +72,11 @@ LIB_PIP_BINPROVIDER = LibPipBinProvider()
LIB_PIP_BINPROVIDER.setup()
pip = LIB_PIP_BINPROVIDER
SYS_PIP_BINPROVIDER.setup()
PIPX_PIP_BINPROVIDER.setup()
VENV_PIP_BINPROVIDER.setup()
LIB_PIP_BINPROVIDER.setup()
# ensure python libraries are importable from these locations (if archivebox wasnt executed from one of these then they wont already be in sys.path)
assert VENV_PIP_BINPROVIDER.pip_venv is not None
assert LIB_PIP_BINPROVIDER.pip_venv is not None

View File

@@ -164,3 +164,4 @@ class PlaywrightBinProvider(BinProvider):
return (proc.stderr.strip() + "\n" + proc.stdout.strip()).strip()
PLAYWRIGHT_BINPROVIDER = PlaywrightBinProvider()
PLAYWRIGHT_BINPROVIDER.setup()

View File

@@ -115,7 +115,7 @@ class PuppeteerBinProvider(BinProvider):
return (proc.stderr.strip() + "\n" + proc.stdout.strip()).strip()
PUPPETEER_BINPROVIDER = PuppeteerBinProvider()
PUPPETEER_BINPROVIDER.setup()
# ALTERNATIVE INSTALL METHOD using Ansible:
# install_playbook = self.plugin_dir / 'install_puppeteer.yml'