From 76f6cfbfdee02d19861e9b610a9aff11dddcac19 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 02:24:51 -0800 Subject: [PATCH 01/27] Update pyproject.toml and merge dev groups --- pyproject.toml | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cb3a0c36..a7a6f461 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,9 @@ name = "archivebox" version = "0.7.1" description = "Self-hosted internet archiving solution." authors = [ - {name = "Nick Sweeting", email = "setup.py@archivebox.io"}, + {name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}, ] dependencies = [ - # "setuptools>=68.2.2", "croniter>=0.3.34", "dateparser>=1.0.0", "django-extensions>=3.0.3", @@ -16,8 +15,7 @@ dependencies = [ "python-crontab>=2.5.1", "requests>=2.24.0", "w3lib>=1.22.0", - # "youtube-dl>=2021.04.17", - "yt-dlp>=2021.4.11", + "yt-dlp>=2023.10.13", # "playwright>=1.39.0; platform_machine != 'armv7l'", ] requires-python = ">=3.9" @@ -56,34 +54,26 @@ classifiers = [ # pdm lock -G:all # pdm install -G:all [tool.pdm.dev-dependencies] -build = [ - "setuptools", +dev = [ + # build + "setuptools>=68.2.2", "wheel", "pdm", - # "bottle", - # "stdeb", - # "twine", -] -lint = [ - "flake8", - "mypy", - "django-stubs", -] -test = [ - "pytest", -] -debug = [ - "django-debug-toolbar", - "djdt_flamegraph", - "ipdb", -] -doc = [ + "homebrew-pypi-poet>=0.10.0", + # docs "recommonmark", "sphinx", "sphinx-rtd-theme", -] -dev = [ - "homebrew-pypi-poet>=0.10.0", + # debug + "django-debug-toolbar", + "djdt_flamegraph", + "ipdb", + # test + "pytest", + # lint + "flake8", + "mypy", + "django-stubs", ] [tool.pdm.scripts] From b3adef6267c59dea6be27ed006f7051a4fa35a46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:49:40 +0000 Subject: [PATCH 02/27] Bump yt-dlp from 2023.10.13 to 2023.11.14 Bumps [yt-dlp](https://github.com/yt-dlp/yt-dlp) from 2023.10.13 to 2023.11.14. - [Release notes](https://github.com/yt-dlp/yt-dlp/releases) - [Changelog](https://github.com/yt-dlp/yt-dlp/blob/master/Changelog.md) - [Commits](https://github.com/yt-dlp/yt-dlp/compare/2023.10.13...2023.11.14) --- updated-dependencies: - dependency-name: yt-dlp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 770ac3e3..aa1cd8b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,4 +43,4 @@ urllib3==2.1.0 w3lib==2.1.2 wcwidth==0.2.10 websockets==12.0 -yt-dlp==2023.10.13 +yt-dlp==2023.11.14 From f81e51a1fc336bc9bd432c1ff532bf27745ff429 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sun, 19 Nov 2023 13:45:00 -0800 Subject: [PATCH 03/27] fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a561a28..2c93d05b 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ curl -sSL 'https://get.archivebox.io' | sh # (or see pip/brew/Docker instruct **ArchiveBox is a powerful, self-hosted internet archiving solution to collect, save, and view websites offline.** -Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they cant save every type of content. +Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they can't save every type of content. *ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save sharable copies of browser bookmarks, preserve evidence for legal cases, backup photos on FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers in academic citations, and more...* From 2619853e60fb7f539f1553a1f909327c6414fea9 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sun, 19 Nov 2023 13:45:58 -0800 Subject: [PATCH 04/27] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c93d05b..104be916 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ curl -sSL 'https://get.archivebox.io' | sh # (or see pip/brew/Docker instruct Without active preservation effort, everything on the internet eventually dissapears or degrades. Archive.org does a great job as a free central archive, but they require all archives to be public, and they can't save every type of content. -*ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save sharable copies of browser bookmarks, preserve evidence for legal cases, backup photos on FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers in academic citations, and more...* +*ArchiveBox is an open source tool that helps you archive web content on your own (or privately within an organization): save copies of browser bookmarks, preserve evidence for legal cases, backup photos from FB / Insta / Flickr, download your media from YT / Soundcloud / etc., snapshot research papers & academic citations, and more...* > ➡️ *Use ArchiveBox as a [command-line package](#quickstart) and/or [self-hosted web app](#quickstart) on Linux, macOS, or in [Docker](#quickstart).* From ff12d34dbfabc0867167095ab9866d3751f80d37 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sun, 19 Nov 2023 13:51:42 -0800 Subject: [PATCH 05/27] warn about delayed releases for some package managers --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 104be916..82240d05 100644 --- a/README.md +++ b/README.md @@ -320,6 +320,10 @@ See the pip-archive
Arch pacman / FreeBSD pkg / Nix nix (Arch/FreeBSD/NixOS/more)
+ +> [!WARNING] +> *These are contributed by external volunteers and may lag behind the official `pip` channel.* +