Merge branch 'main' into dev

README.md

@@ -259,9 +259,10 @@ See <a href="https://docs.sweeting.me/s/against-curl-sh">"Against curl | sh as a
 
 <li>Install <a href="https://realpython.com/installing-python/">Python >= v3.10</a> and <a href="https://nodejs.org/en/download/package-manager/">Node >= v18</a> on your system (if not already installed).</li>
 <li>Install the ArchiveBox package using <code>pip3</code> (or <a href="https://pipx.pypa.io"><code>pipx</code></a>).
-<pre lang="bash"><code style="white-space: pre-line">pip3 install archivebox
+<pre lang="bash"><code style="white-space: pre-line">pip3 install --upgrade archivebox yt-dlp playwright
+playwright install --with-deps chromium
 archivebox version
-# install any missing extras shown using apt/brew/pkg/etc.
+# install any missing extras shown using apt/brew/pkg/etc. see Wiki for instructions
 #    python@3.10 node curl wget git ripgrep ...
 </code></pre>
 <i>See the <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Install">Install: Bare Metal</a> Wiki for full install instructions for each OS...</i>
@@ -269,7 +270,7 @@ archivebox version
 <li>Create a new empty directory and initialize your collection (can be anywhere).
 <pre lang="bash"><code style="white-space: pre-line">mkdir -p ~/archivebox/data && cd ~/archivebox/data   # for example
 archivebox init --setup   # instantialize a new collection
-# (--setup auto-installs and link JS dependencies: singlefile, readability, etc.)
+# (--setup auto-installs and link JS dependencies: singlefile, readability, mercury, etc.)
 </code></pre>
 </li>
 <li>Optional: Start the server then login to the Web UI <a href="http://127.0.0.1:8000">http://127.0.0.1:8000</a> ⇢ Admin.
@@ -301,7 +302,9 @@ sudo apt update
 <li>Install the ArchiveBox package using <code>apt</code>.
 <pre lang="bash"><code style="white-space: pre-line">sudo apt install archivebox
 # update to newest version with pip (sometimes apt package is outdated)
-pip install --upgrade --ignore-installed archivebox
+pip install --upgrade --ignore-installed archivebox yt-dlp playwright
+playwright install --with-deps chromium    # install chromium and its system dependencies
+archivebox version                         # make sure all dependencies are installed
 </code></pre>
 </li>
 <li>Create a new empty directory and initialize your collection (can be anywhere).
@@ -333,7 +336,9 @@ See <a href="#%EF%B8%8F-cli-usage">below</a> for more usage examples using the C
 <pre lang="bash"><code style="white-space: pre-line">brew tap archivebox/archivebox
 brew install archivebox
 # update to newest version with pip (sometimes brew package is outdated)
-pip install --upgrade --ignore-installed archivebox
+pip install --upgrade --ignore-installed archivebox yt-dlp playwright
+playwright install --with-deps chromium    # install chromium and its system dependencies
+archivebox version                         # make sure all dependencies are installed
 </code></pre>
 <i>See the <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Install#option-c-bare-metal-setup">Install: Bare Metal</a> Wiki for more granular instructions for macOS... ➡️</i>
 </li>

requirements.txt

@@ -1,112 +1,54 @@
 # This file is @generated by PDM.
 # Please do not edit it manually.
 
-alabaster==0.7.16
 asgiref==3.7.2
 asttokens==2.4.1
-babel==2.14.0
-blinker==1.7.0
 brotli==1.1.0; implementation_name == "cpython"
 brotlicffi==1.1.0.0; implementation_name != "cpython"
-cachecontrol==0.14.0
+certifi==2023.11.17
-certifi==2024.2.2
 cffi==1.16.0; implementation_name != "cpython"
 charset-normalizer==3.3.2
 colorama==0.4.6; sys_platform == "win32"
-commonmark==0.9.1
 croniter==2.0.1
 dateparser==1.2.0
 decorator==5.1.1
-dep-logic==0.0.4
-distlib==0.3.8
 django==3.1.14
-django-debug-toolbar==3.2.4
+django-auth-ldap==4.1.0
 django-extensions==3.1.5
-django-stubs==4.2.7
-django-stubs-ext==4.2.7
-djdt-flamegraph==0.2.13
-docutils==0.20.1
 exceptiongroup==1.2.0; python_version < "3.11"
 executing==2.0.1
-filelock==3.13.1
-findpython==0.4.1
-flake8==7.0.0
-homebrew-pypi-poet==0.10.0
 idna==3.6
-imagesize==1.4.1
+ipython==8.18.1
-iniconfig==2.0.0
-installer==0.7.0
-ipdb==0.13.13
-ipython==8.21.0
 jedi==0.19.1
-Jinja2==3.1.3
-markdown-it-py==3.0.0
-MarkupSafe==2.1.5
 matplotlib-inline==0.1.6
-mccabe==0.7.0
-mdurl==0.1.2
-msgpack==1.0.7
 mutagen==1.47.0
-mypy==1.8.0
 mypy-extensions==1.0.0
-packaging==23.2
 parso==0.8.3
-pdm==2.12.3
 pexpect==4.9.0; sys_platform != "win32"
-platformdirs==4.2.0
-pluggy==1.4.0
 prompt-toolkit==3.0.43
 ptyprocess==0.7.0; sys_platform != "win32"
 pure-eval==0.2.2
 pyasn1==0.5.1
 pyasn1-modules==0.3.0
-pycodestyle==2.11.1
 pycparser==2.21; implementation_name != "cpython"
-pycryptodomex==3.20.0
+pycryptodomex==3.19.1
-pyflakes==3.2.0
 pygments==2.17.2
-pyproject-hooks==1.0.0
-pytest==8.0.1
 python-crontab==3.0.0
 python-dateutil==2.8.2
-python-dotenv==1.0.1
+python-ldap==3.4.4
-pytz==2024.1
+pytz==2023.3.post1
-recommonmark==0.7.1
 regex==2023.12.25
 requests==2.31.0
-requests-toolbelt==1.0.0
-resolvelib==1.0.1
-rich==13.7.0
-setuptools==69.1.0
-shellingham==1.5.4
 six==1.16.0
-snowballstemmer==2.2.0
 sonic-client==1.0.0
-sphinx==7.2.6
-sphinx-rtd-theme==2.0.0
-sphinxcontrib-applehelp==1.0.8
-sphinxcontrib-devhelp==1.0.6
-sphinxcontrib-htmlhelp==2.0.5
-sphinxcontrib-jquery==4.1
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.7
-sphinxcontrib-serializinghtml==1.1.10
 sqlparse==0.4.4
 stack-data==0.6.3
-tomli==2.0.1; python_version < "3.11"
-tomlkit==0.12.3
 traitlets==5.14.1
-truststore==0.8.0; python_version >= "3.10"
+typing-extensions==4.9.0; python_version < "3.11"
-types-pytz==2024.1.0.20240203
+tzdata==2023.4; platform_system == "Windows"
-types-PyYAML==6.0.12.12
-typing-extensions==4.9.0
-tzdata==2024.1; platform_system == "Windows"
 tzlocal==5.2
-unearth==0.14.0
+urllib3==2.1.0
-urllib3==2.2.1
-virtualenv==20.25.0
 w3lib==2.1.2
-wcwidth==0.2.13
+wcwidth==0.2.12
 websockets==12.0
-wheel==0.42.0
 yt-dlp==2023.12.30