From patchwork Wed Jun 19 02:13:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65487 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 85FE527BBEA; Wed, 19 Jun 2024 03:14:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4D1DB27BBE2 for ; Wed, 19 Jun 2024 03:14:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpl-0008A3-8O; Tue, 18 Jun 2024 22:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpj-00089i-Kv for guix-patches@gnu.org; Tue, 18 Jun 2024 22:13:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpj-0000Op-Ci for guix-patches@gnu.org; Tue, 18 Jun 2024 22:13:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpm-0001zs-5Z for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 1/6] gnu: yt-dlp: Don't inherit from youtube-dl. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632157571 (code B ref 71640); Wed, 19 Jun 2024 02:14:02 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:35 +0000 Received: from localhost ([127.0.0.1]:58210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpK-0001xv-CJ for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:35 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:34633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpH-0001xJ-KL for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:32 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.nyi.internal (Postfix) with ESMTP id 4AD3E13805D2; Tue, 18 Jun 2024 22:13:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 18 Jun 2024 22:13:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=mesmtp; t=1718763203; x=1718849603; bh=l4/O60lfvqrK5lRcjN UCMqtQvPKJ3xskpi1uUWbF0nU=; b=l65m0yfHPF7L5+/qloZp7zdiym8y/Mwzie /4C7yg993ehF9+++rEHJbF4GN7t3lmJNyxt9IJxLLNk0QM/hCe2J22xWjVwf/DqB 5+M3C7E192qJb3WF4e+xHkvTt7MAygigVkhkO942FDYhGEHPS/fsIcch7fuO4E4+ pGnbfI9ls= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1718763203; x=1718849603; bh=l4/O60lfvqrK5lRcjNUCMqtQvPKJ 3xskpi1uUWbF0nU=; b=JnUk4MRxmJJexfRQ1KGYOmD6J4gXf3bn3Kna+bkqBSZO cJjP4DXcWjPFLSpodkVI1Y73Rk9K2FncREJOOgPH6XMu3NLfDuJSXHLD6tWp+Qs5 PS8bz/0W3q5XIo6rijd4toYsbogzDF9PiOKizRAiJydj3cLVd9zUobF5brizSFUj My0mKxZJtYvGx3epkc/e6/to5D2bXRWj5yzEnQUF0LE0oEpLT7XsfP/IsgjUYwA3 KJT5Xem2Ic5B1HpjYZKN1wVCkgjMULmId2Jn/w/4RYzDx0YzvYMkU0Th+P0sl5J6 9VzfZ2VJP25FPrRyYMP8YZKMrVf77ymtBs7d/2QpMA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepueelfeffvdevveeileehgfevgeehuedttd ehvddttdffffeghfdtjedtteelkeeknecuffhomhgrihhnpehgnhhurdhorhhgpdhphihp ihdrohhrghdpghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:22 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:10 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches yt-dlp has diverged from youtube-dl sufficiently that package inheritance hinders package maintenance. * gnu/packages/video.scm (yt-dlp): Don't inherit from YOUTUBE-DL. [build-system, synopsis, license]: New fields. [arguments]: Adjust accordingly. [inputs]: Add FFMPEG. Change-Id: I14c4cfb6a75ba0421c62eac778072ab3e76c72a1 Reviewed-by: Maxim Cournoyer --- gnu/packages/video.scm | 95 ++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 46 deletions(-) base-commit: b993f4735d41e690dbafb8ee2e17fce996a8cf20 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e7e61303a9..76e4a8a02f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3135,7 +3135,7 @@ (define-public youtube-dl (license license:public-domain))) (define-public yt-dlp - (package/inherit youtube-dl + (package (name "yt-dlp") (version "2023.10.13") (source @@ -3147,51 +3147,52 @@ (define-public yt-dlp (file-name (git-file-name name version)) (sha256 (base32 "1cy8cpqwq6yfsbrnln3qqp9lsjckn20m6w7b890ha7jahyir5m1n")))) + (build-system python-build-system) (arguments - (substitute-keyword-arguments (package-arguments youtube-dl) - ((#:tests? _) (not (%current-target-system))) - ((#:phases phases) - #~(modify-phases #$phases - ;; See the comment for the corresponding phase in youtube-dl. - (replace 'default-to-the-ffmpeg-input - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "yt_dlp/postprocessor/ffmpeg.py" - (("location = self.get_param(.*)$") - (string-append - "location = '" - (dirname (search-input-file inputs "bin/ffmpeg")) - "'\n"))))) - (replace 'build-generated-files - (lambda* (#:key inputs #:allow-other-keys) - (if (assoc-ref inputs "pandoc") - (invoke "make" - "PYTHON=python" - "yt-dlp" - "yt-dlp.1" - "completions") - (invoke "make" - "PYTHON=python" - "yt-dlp" - "completions")))) - (replace 'fix-the-data-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((prefix (assoc-ref outputs "out"))) - (substitute* "setup.py" - (("'etc/") - (string-append "'" prefix "/etc/")) - (("'share/") - (string-append "'" prefix "/share/")))))) - (delete 'install-completion) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-k" "not download")))))))) - (inputs (modify-inputs (package-inputs youtube-dl) - (append python-brotli - python-certifi - python-mutagen - python-pycryptodomex - python-websockets))) + `(#:tests? ,(not (%current-target-system)) + #:phases + (modify-phases %standard-phases + ;; See . + ;; ffmpeg is big but required to request free formats from, e.g., + ;; YouTube so pull it in unconditionally. Continue respecting the + ;; --ffmpeg-location argument. + (add-after 'unpack 'default-to-the-ffmpeg-input + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "yt_dlp/postprocessor/ffmpeg.py" + (("location = self.get_param(.*)$") + (string-append + "location = '" + (dirname (search-input-file inputs "bin/ffmpeg")) + "'\n"))))) + (add-before 'build 'build-generated-files + (lambda* (#:key inputs #:allow-other-keys) + (if (assoc-ref inputs "pandoc") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "yt-dlp.1" + "completions") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "completions")))) + (add-before 'install 'fix-the-data-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((prefix (assoc-ref outputs "out"))) + (substitute* "setup.py" + (("'etc/") + (string-append "'" prefix "/etc/")) + (("'share/") + (string-append "'" prefix "/share/")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-k" "not download"))))))) + (inputs (list ffmpeg python-brotli + python-certifi + python-mutagen + python-pycryptodomex + python-websockets)) (native-inputs (append ;; To generate the manpage. @@ -3199,13 +3200,15 @@ (define-public yt-dlp (list pandoc) '()) (list python-pytest zip))) + (synopsis "Download videos from YouTube.com and other sites") (description "yt-dlp is a small command-line program to download videos from YouTube.com and many more sites. It is a fork of youtube-dl with a focus on adding new features while keeping up-to-date with the original project.") (properties '((release-monitoring-url . "https://pypi.org/project/yt-dlp/"))) - (home-page "https://github.com/yt-dlp/yt-dlp"))) + (home-page "https://github.com/yt-dlp/yt-dlp") + (license license:public-domain))) (define-public you-get (package From patchwork Wed Jun 19 02:13:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65485 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 93BEF27BBE9; Wed, 19 Jun 2024 03:14:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D00B727BBE2 for ; Wed, 19 Jun 2024 03:14:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpq-0008Bb-J4; Tue, 18 Jun 2024 22:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpp-0008BM-Bg for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpp-0000Qk-2k; Tue, 18 Jun 2024 22:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpm-000201-IR; Tue, 18 Jun 2024 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 2/6] gnu: Add python-requests 2.31.0. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632167585 (code B ref 71640); Wed, 19 Jun 2024 02:14:02 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:36 +0000 Received: from localhost ([127.0.0.1]:58214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpL-0001y4-64 for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:35 -0400 Received: from fout1-smtp.messagingengine.com ([103.168.172.144]:60199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpI-0001xL-1w for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:33 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.nyi.internal (Postfix) with ESMTP id EA8DD13805D4; Tue, 18 Jun 2024 22:13:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 18 Jun 2024 22:13:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=mesmtp; t= 1718763203; x=1718849603; bh=wUz1Nt+2yaV3W85y5yHkbixGD2kpbTIMQ8v uVefcL5M=; b=OtkUFyYzWcdU71l4+Gwto5dQH/59BVvZjjd9E93BRYHdz3akWYH b61XyD+Vm2FaclOdQZc4eL1ngbW84HXPOGk+MfDzEBx1DNOFTCD8joq016rX1sp7 IonFGptiasbEOQRPw0TUZwbY1PMIneJhPO6aTYnG0tegXGmkZwBqPsNc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1718763203; x= 1718849603; bh=wUz1Nt+2yaV3W85y5yHkbixGD2kpbTIMQ8vuVefcL5M=; b=F RLBGLX9lLE9FGMtciOVUAJHxeyekCIU1ps+ihZvwZopkN6L2iihuyNw5Ixpq7j65 gEY+f51agvwXogK2UnjD9CdzEMUxXi59UxdsGPo3voXukQ3XBcbtIuftnwtnWZ4g uDK5Svb5GK/Xsk1+C/uD2MSDKV8XXmxnPTC5ThOHfbFpfN6nyEUqN9xO476s9HtO 327sVRWv4LxW1ig3KgcoJCxfG7MP8HRvf5pb/mdcg+PgtUQ/7pX/vEZjBWA9u6QM mJk7e8F35GhBpzKebuqOgrf8EGylv4WnCpue0zmHJHkJ5e6dvDGTBozeH+6wH8H0 xtMIwbejRHzXyjliLgm+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedvieeufeffgfdvveetvdefhfetve elkeetleekgeejjeekfedufedtueekffejueenucffohhmrghinhepphihthhhohhnqdhr vghquhgvshhtshdrohhrghdphhhtthhptghlihgvnhhtlhhisghrrghrhidrihhtnecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgr mhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:23 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:11 -0400 Message-ID: <2835a9879fa8be8172b2b4d86c5d5395ec80dd83.1718763195.git.leo@famulari.name> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is the minimum required version in recent versions of yt-dlp. * gnu/packages/python-web.scm (python-requests-next): New variable. Change-Id: I825cb928297cddc2fbbca1ce5acdbf6cff276bbc --- gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1363e6ccdf..2686cb283f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3603,6 +3603,32 @@ (define-public python-requests than Python’s urllib2 library.") (license license:asl2.0))) +(define-public python-requests-next + (package + (name "python-requests") + (version "2.31.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "requests" version)) + (sha256 + (base32 + "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l")))) + (build-system python-build-system) + (propagated-inputs + (list python-certifi + python-charset-normalizer + python-idna + python-urllib3)) + (arguments + ;; FIXME: Some tests require network access. + '(#:tests? #f)) + (home-page "http://python-requests.org/") + (synopsis "Python HTTP library") + (description + "Requests is a Python HTTP client library. It aims to be easier to use +than Python’s urllib2 library.") + (license license:asl2.0))) + (define-public python-requests-kerberos (package (name "python-requests-kerberos") From patchwork Wed Jun 19 02:13:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65489 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 88C4627BBE2; Wed, 19 Jun 2024 03:14:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9CF5B27BBEA for ; Wed, 19 Jun 2024 03:14:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpu-0008Cv-Rl; Tue, 18 Jun 2024 22:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpt-0008CM-Mf for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpt-0000WA-E0; Tue, 18 Jun 2024 22:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpm-000207-Uc; Tue, 18 Jun 2024 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 3/6] gnu: Add python-urllib3 1.26.17. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632167593 (code B ref 71640); Wed, 19 Jun 2024 02:14:02 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:36 +0000 Received: from localhost ([127.0.0.1]:58216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpL-0001yI-SR for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:36 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:43015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpI-0001xO-Tj for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:33 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id A36921140282; Tue, 18 Jun 2024 22:13:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 18 Jun 2024 22:13:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1718763204; x= 1718849604; bh=Hy3ztswevBmx4bTfz5HprN32bCxwIby3l9oT8b9MN0E=; b=W nF89VhYgNMVc89BupFEiFEoM7io1uLyYdZdwJiVujwCyCqkM1tj/psUVjg1nMBJG S8Aivfpu3k0XMpDMrMn6q22ARCIZHtXQ3hM5y1KDddBJX0tesu9bOkGd++lXWMmr 34UR9W7U5tgABz1Z7sJ8NP4LUQ7wxXfhCYC2WY3n0A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1718763204; x=1718849604; bh=Hy3ztswevBmx4 bTfz5HprN32bCxwIby3l9oT8b9MN0E=; b=F6islRQjRBCA6raBcWso+oenJNHEp Eg71dXNZIKtOg+j3iP0ZfuNYHstW/v1Ltp/MXe31Tu3SXyPp7Ze5i+IM5XgsNHWF 3wrEIHMw5XkM3GHI+GqnJm9atpiDPBdmTQGuoPjDylwJ4ZgFuiOFhDrUShulUemr jNkSCzbdew6PAzOdVbqmi6lEtXG4e+MUbJ8nHa7cHvdBXE8/QtHmlahwq7ErNZtn 4esOvfOqWiiop7laAv3kL3bpgutRPHu0IjkGuw8gODuSHGgByDB/4dho3n1qFEo/ LndVmDSXNKLcp3QtzZs42a1Kj9MUeSJo8KrMBoZquGQVHg5jOOl+pfPyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepieffteegveeikedvhefflefhfedvff dtgfetkeeiffeilefgiedvhfevtefgfeevnecuffhomhgrihhnpehrvggrughthhgvugho tghsrdhiohenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:24 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:12 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is the minimum required version in recent versions of yt-dlp. * gnu/packages/python-web.scm (python-urllib3-next): New variable. Change-Id: Ib57bbe45fd1c9c9fa3872a00f161979762feacf6 --- gnu/packages/python-web.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2686cb283f..98aa46dafc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4024,6 +4024,41 @@ (define-public python-urllib3 supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) +(define-public python-urllib3-next + (package + (name "python-urllib3") + (version "1.26.17") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urllib3" version)) + (sha256 + (base32 + "08fzhaf77kbjj5abpl9xag6fpfxkdp1k5s7sqd3ayacdq91a5mi4")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) + (propagated-inputs + (append + ;; These 5 inputs are used to build urrlib3[secure] + (list python-certifi) + (if (member (%current-system) + (package-transitive-supported-systems python-cryptography)) + (list python-cryptography) + '()) + (list python-idna) + (if (member (%current-system) + (package-transitive-supported-systems python-pyopenssl)) + (list python-pyopenssl) + '()) + (list python-pysocks))) + (home-page "https://urllib3.readthedocs.io/") + (synopsis "HTTP library with thread-safe connection pooling") + (description + "Urllib3 supports features left out of urllib and urllib2 libraries. It +can reuse the same socket connection for multiple requests, it can POST files, +supports url redirection and retries, and also gzip and deflate decoding.") + (license license:expat))) + (define-public awscli (package ;; Note: updating awscli typically requires updating botocore as well. From patchwork Wed Jun 19 02:13:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65486 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EF97627BBE2; Wed, 19 Jun 2024 03:14:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2390C27BBE9 for ; Wed, 19 Jun 2024 03:14:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpx-0008Dw-3D; Tue, 18 Jun 2024 22:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpu-0008Ct-Pc for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpu-0000WQ-GC; Tue, 18 Jun 2024 22:14:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpn-00020E-AD; Tue, 18 Jun 2024 22:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 4/6] gnu: python-pytest-sanic: Further relax the websockets version requirements. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632167600 (code B ref 71640); Wed, 19 Jun 2024 02:14:03 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:36 +0000 Received: from localhost ([127.0.0.1]:58218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpM-0001yQ-AN for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:36 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:53097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpJ-0001xP-HI for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:33 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 689F51140322; Tue, 18 Jun 2024 22:13:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 18 Jun 2024 22:13:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1718763205; x= 1718849605; bh=VBGOcJvLYLEfmMiBqtHCl5UdlfCdcZhcgGijuT9PLIk=; b=K 1M5PzRijQkLZ28bTb9lT0yt6NI5HnTucLUlAWdU+Um4gwLz7ivAoz214LsuYL6cA 9rjuLGvJKwBjfHuVKeiQcAIWYGwD54b1FDCXatMJ9x6Q/ZwBXlKpCPDNZYzT7aAe Ju8p0YRFq/IQM0hXTuKlHEfYAFO/UJG4sTmXioQ5qM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1718763205; x=1718849605; bh=VBGOcJvLYLEfm MiBqtHCl5UdlfCdcZhcgGijuT9PLIk=; b=ZOMjnO9+Q1frzDZSuo3/AXkXb/55I gZPizt3EGiHxghDksrT7NR+1voDR2i+6Avv+y0mV6a0hw9Zl4YU2kGDsf51FG1HS 1bITwhTc5sJMH4AXasXRYLRk1CV5G1DfkdFsQ8DMGz2i2Ivu7tuzLewbF/W8qh5W 7Ku9Mj20xth7kg2EhMGJ2RdrnL0L5wD02xJrjfnCwSRWALckSqcjvtXtCPtbvcd0 W6eTQuTkwDt5KTHPafWs7b96NO1e7eqadyZ98nXx3ZdMy+YtdhuB7XSNK8G+6U28 eQY9DHUep6esC8iie6ZrqM/7bEJEpbG4/872jJig3gMcfuHWpWxwEot5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfeggeetiedtvdduudevueehvdehhf efhefghedvhfdugeeukeehvdfhfffhhfegnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:25 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:13 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-check.scm (python-pytest-sanic)[arguments]: Accept PYTHON-WEBSOCKETS 12.0 in the custom 'relax-requirements' phase. Change-Id: I279d7f98ff2f1fe3be46ffd4f06bbc3005c453b5 --- gnu/packages/python-check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index c5607df1ec..a895c7bb2c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2256,7 +2256,7 @@ (define-public python-pytest-sanic (lambda _ (substitute* "setup.py" (("websockets.*<11.0") - "websockets<12.0"))))))) + "websockets<13.0"))))))) (propagated-inputs (list python-httpx python-async-generator python-pytest python-websockets)) From patchwork Wed Jun 19 02:13:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65488 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 587BE27BBEA; Wed, 19 Jun 2024 03:14:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D576927BBE2 for ; Wed, 19 Jun 2024 03:14:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpu-0008Cu-RZ; Tue, 18 Jun 2024 22:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpt-0008CL-KM for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpt-0000W5-Bg; Tue, 18 Jun 2024 22:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpn-00020K-Oy; Tue, 18 Jun 2024 22:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 5/6] gnu: python-websockets: Update to 12.0 Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632237618 (code B ref 71640); Wed, 19 Jun 2024 02:14:03 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:43 +0000 Received: from localhost ([127.0.0.1]:58222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpS-0001yl-Mt for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:43 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:36181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpK-0001xR-6r for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:34 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 1BBF31140323; Tue, 18 Jun 2024 22:13:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 18 Jun 2024 22:13:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1718763206; x= 1718849606; bh=gLJPcFQzLCMt4mttAW4rHn1eOwjUA2AYMEHyZJnUMHY=; b=P JB1ew/UFUPW0tqkPj4bHR0dYWUkW2FITn85WSzUwSxDmcHWAJWMDw91LMMgz74oX pJbRqUzZVSBZQQhqa4w60YEtDxcL4hyOXdgo3+JUVVtMOSQkNcZo+4AUsYo7ceDt 1rR+xlyIg2Ui+qvv7j/ma7QJfECK2K9UA8mJc5iqvU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1718763206; x=1718849606; bh=gLJPcFQzLCMt4 mttAW4rHn1eOwjUA2AYMEHyZJnUMHY=; b=DAOc2ZjFzdOkik4qjc5GsBcapPfsi OP8z3ZUQSMigeImFxMHK97R6hrbt8GDvvTtEFFFOGiWtlndOqTkfyDYYvUwjSvX5 67DF0MytC2gaRlU2ssm+hHB3fCXQ9241pweGkzDXHL/VEtaXjieeGqU0IlVh/egQ Fzijc+VV/2cza8h2cjbSJ985vlDQrtPHxIYhCwuYGR2u3VoY7BkyoRehBmttyefD 7MjnB1Oy/nofTPBE/HIqV4JkU4BnmmTbKZCyxclIGlMl7jqSt2zXZYZOZETb39VW xueot1o+uzDA0PRYTcUeP+ZLNYoPHL5hETBKkuGv87jMHkVe9c4hply5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfeggeetiedtvdduudevueehvdehhf efhefghedvhfdugeeukeehvdfhfffhhfegnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:25 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:14 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (python-websockets): Update to 12.0. Change-Id: I6217093bbdfb81b35eb7c8d59ada3f612b7d9511 --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 98aa46dafc..eef63351ef 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6754,7 +6754,7 @@ (define-public python-warcio (define-public python-websockets (package (name "python-websockets") - (version "11.0.3") + (version "12.0") (source (origin (method git-fetch) @@ -6764,7 +6764,7 @@ (define-public python-websockets (file-name (git-file-name name version)) (sha256 (base32 - "1hn1qzpk1fvhi5j5nz4xlvzwkj9y16c9gryrb4n4dza84qi1pna5")))) + "1a587a1knjsy9zmgab9v2yncx0803pg2hfcvf7kz6vs8ixaggqmh")))) (build-system python-build-system) (arguments (list #:phases From patchwork Wed Jun 19 02:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 65484 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6218227BBEB; Wed, 19 Jun 2024 03:14:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 86FA827BBE9 for ; Wed, 19 Jun 2024 03:14:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJkpm-0008Ae-JO; Tue, 18 Jun 2024 22:14:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJkpl-0008A6-Fq for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJkpl-0000PB-7J for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJkpo-00020Q-4k for guix-patches@gnu.org; Tue, 18 Jun 2024 22:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71640] [PATCH 6/6] gnu: yt-dlp: Update to 2024.05.27. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 02:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 71640@debbugs.gnu.org Received: via spool by 71640-submit@debbugs.gnu.org id=B71640.17187632247625 (code B ref 71640); Wed, 19 Jun 2024 02:14:04 +0000 Received: (at 71640) by debbugs.gnu.org; 19 Jun 2024 02:13:44 +0000 Received: from localhost ([127.0.0.1]:58224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpT-0001yp-8T for submit@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:44 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:52399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJkpK-0001xT-W3 for 71640@debbugs.gnu.org; Tue, 18 Jun 2024 22:13:35 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id DB7841140324; Tue, 18 Jun 2024 22:13:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 18 Jun 2024 22:13:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1718763206; x= 1718849606; bh=sbL5RYlYqqEtKudROtd3WHUccmjbJ4uI5ptY6Uk226c=; b=o KY17p3eUgYUkF05k7yuSoIXYOltDcMG0+FcOgJb+Big9+UXwKnbSk46LAlU7GeEn TelsYpYSfnYuN8X08EyLU/f6MfbN8T1t6xJh02lhQ4yAknz9LYnKAjHzC5XL/iYE /OhCaKndAS2GwC8GWpvekVq36pmUtGZgQ3IbhXTRq0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1718763206; x=1718849606; bh=sbL5RYlYqqEtK udROtd3WHUccmjbJ4uI5ptY6Uk226c=; b=X9j4ZQPlftmQ0scvq38OMwLPJZ/bq pFkWjHI82MjG7dCNEJdrbj+pjp/BbQna1Uj9/5ggQwMVLfJZPhjE3dAnemw2Xltw GutrUikV/A37N8c1YhrHOW7E2CAPFs4fcge+eaRr24kIcqMzo9Rq96a72+vWRXYi W0hRQLS7su1DQtoUUocph9y1wouvLoRe8nZCAszp7LFRI1OrslUS2S8cABELkkcZ QAK5GdFmyb7bvpmaqq2Iibo78agT2iZbW6Jvbg/stPBzrJdP6AIkqqTaBG3nXD0c WboIixr1Gzzdj2+sOD3PWyBrsmDwPXIJKVtRhhVsveuZ5edQuzAKYfPoQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvledgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfeggeetiedtvdduudevueehvdehhf efhefghedvhfdugeeukeehvdfhfffhhfegnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <71640@debbugs.gnu.org>; Tue, 18 Jun 2024 22:13:26 -0400 (EDT) From: Leo Famulari Date: Tue, 18 Jun 2024 22:13:15 -0400 Message-ID: <79fa17151ff834161b71e2dbffe853ddff29a66d.1718763195.git.leo@famulari.name> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (yt-dlp): Update to 2024.05.27. [build-system]: Use PYPROJECT-BUILD-SYSTEM. [arguments]: Remove the custom build phase 'fix-the-data-directories', because There is no longer a setup.py file to be amended. [inputs]: Add PYTHON-REQUESTS-NEXT and PYTHON-URLLIB3-NEXT. [native-inputs]: Add PYTHON-HATCHLING. Change-Id: I0c9e609817071346ca85d1f0966cf8994b2da2c5 --- gnu/packages/video.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 76e4a8a02f..e3c20693fc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3137,7 +3137,7 @@ (define-public youtube-dl (define-public yt-dlp (package (name "yt-dlp") - (version "2023.10.13") + (version "2024.05.27") (source (origin (method git-fetch) @@ -3146,8 +3146,8 @@ (define-public yt-dlp (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1cy8cpqwq6yfsbrnln3qqp9lsjckn20m6w7b890ha7jahyir5m1n")))) - (build-system python-build-system) + (base32 "13j6vg0kxfw3hppq7gzbz2d72g415071gh5arkwzj902rh0c7777")))) + (build-system pyproject-build-system) (arguments `(#:tests? ,(not (%current-target-system)) #:phases @@ -3176,14 +3176,6 @@ (define-public yt-dlp "PYTHON=python" "yt-dlp" "completions")))) - (add-before 'install 'fix-the-data-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((prefix (assoc-ref outputs "out"))) - (substitute* "setup.py" - (("'etc/") - (string-append "'" prefix "/etc/")) - (("'share/") - (string-append "'" prefix "/share/")))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -3192,6 +3184,8 @@ (define-public yt-dlp python-certifi python-mutagen python-pycryptodomex + python-requests-next ; TODO Remove this special package + python-urllib3-next ; TODO Remove this one too python-websockets)) (native-inputs (append @@ -3199,7 +3193,7 @@ (define-public yt-dlp (if (supported-package? pandoc) (list pandoc) '()) - (list python-pytest zip))) + (list python-hatchling python-pytest zip))) (synopsis "Download videos from YouTube.com and other sites") (description "yt-dlp is a small command-line program to download videos from