From 671d5696fb4be4c67748c9a7dc6c87c81f1492e3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 09:54:23 +0200 Subject: Merging debian version 2024.04.09-1. Signed-off-by: Daniel Baumann --- debian/patches/0001-Correct-path-for-docs.patch | 19 ------------------- debian/patches/0001-Debianize-paths.patch | 22 ++++++++++++++++++++++ debian/patches/0003-Remove-use-of-git.patch | 4 ++-- ...Don-t-run-flake8-when-running-offlinetest.patch | 2 +- debian/patches/0005-Skip-failing-tests.patch | 15 +++++++++++++++ debian/patches/series | 3 ++- 6 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/0001-Correct-path-for-docs.patch create mode 100644 debian/patches/0001-Debianize-paths.patch create mode 100644 debian/patches/0005-Skip-failing-tests.patch (limited to 'debian/patches') diff --git a/debian/patches/0001-Correct-path-for-docs.patch b/debian/patches/0001-Correct-path-for-docs.patch deleted file mode 100644 index 754a265..0000000 --- a/debian/patches/0001-Correct-path-for-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Correct path for docs. -Author: Unit 193 -Forwarded: not-needed - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -112,7 +112,7 @@ artifacts = ["/yt_dlp/extractor/lazy_ext - "completions/bash/yt-dlp" = "share/bash-completion/completions/yt-dlp" - "completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp" - "completions/fish/yt-dlp.fish" = "share/fish/vendor_completions.d/yt-dlp.fish" --"README.txt" = "share/doc/yt_dlp/README.txt" -+"README.txt" = "share/doc/yt-dlp/README.txt" - "yt-dlp.1" = "share/man/man1/yt-dlp.1" - - [tool.hatch.version] diff --git a/debian/patches/0001-Debianize-paths.patch b/debian/patches/0001-Debianize-paths.patch new file mode 100644 index 0000000..54ba2fd --- /dev/null +++ b/debian/patches/0001-Debianize-paths.patch @@ -0,0 +1,22 @@ +Description: Debianize paths. +Author: Unit 193 +Forwarded: not-needed + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -114,9 +114,9 @@ artifacts = ["/yt_dlp/extractor/lazy_ext + + [tool.hatch.build.targets.wheel.shared-data] + "completions/bash/yt-dlp" = "share/bash-completion/completions/yt-dlp" +-"completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp" ++"completions/zsh/_yt-dlp" = "share/zsh/vendor-completions/_yt-dlp" + "completions/fish/yt-dlp.fish" = "share/fish/vendor_completions.d/yt-dlp.fish" +-"README.txt" = "share/doc/yt_dlp/README.txt" ++"README.txt" = "share/doc/yt-dlp/README.txt" + "yt-dlp.1" = "share/man/man1/yt-dlp.1" + + [tool.hatch.version] diff --git a/debian/patches/0003-Remove-use-of-git.patch b/debian/patches/0003-Remove-use-of-git.patch index f722b2f..1a32b99 100644 --- a/debian/patches/0003-Remove-use-of-git.patch +++ b/debian/patches/0003-Remove-use-of-git.patch @@ -14,6 +14,6 @@ Forwarded: not-needed # make pypi-files && python3 -m build -sn . -pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \ +pypi-files: Changelog.md LICENSE README.md README.txt supportedsites \ - completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/* + completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/* - .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites + .PHONY: all clean clean-all clean-test clean-dist clean-cache \ diff --git a/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch b/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch index 3db4af3..5463e7b 100644 --- a/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch +++ b/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch @@ -14,7 +14,7 @@ Therefore, I'm disabling this. --- a/Makefile +++ b/Makefile -@@ -73,7 +73,7 @@ test: +@@ -76,7 +76,7 @@ test: $(PYTHON) -m pytest $(MAKE) codetest diff --git a/debian/patches/0005-Skip-failing-tests.patch b/debian/patches/0005-Skip-failing-tests.patch new file mode 100644 index 0000000..3dbe6e3 --- /dev/null +++ b/debian/patches/0005-Skip-failing-tests.patch @@ -0,0 +1,15 @@ +Description: Skip a failing test +Author: Unit 193 +Bug: https://github.com/yt-dlp/yt-dlp/issues/9659 +Forwarded: not-needed + +--- yt-dlp-2024.04.09.orig/test/test_networking.py ++++ yt-dlp-2024.04.09/test/test_networking.py +@@ -543,6 +543,7 @@ class TestHTTPRequestHandler(TestRequest + + @pytest.mark.parametrize('handler', ['Urllib', 'Requests', 'CurlCFFI'], indirect=True) + def test_connect_timeout(self, handler): ++ pytest.skip(f'Skipping failing test.') + # nothing should be listening on this port + connect_timeout_url = 'http://10.255.255.255' + with handler(timeout=0.01) as rh: diff --git a/debian/patches/series b/debian/patches/series index 7fff434..eec4500 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ -0001-Correct-path-for-docs.patch +0001-Debianize-paths.patch 0003-Remove-use-of-git.patch 0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch +0005-Skip-failing-tests.patch -- cgit v1.2.3