From patchwork Tue Mar 22 00:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chadwain Holness X-Patchwork-Id: 38002 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 A169827BBE9; Tue, 22 Mar 2022 00:52:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 8E56B27BBEA for ; Tue, 22 Mar 2022 00:52:12 +0000 (GMT) Received: from localhost ([::1]:48384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWSkt-0000ft-LO for patchwork@mira.cbaines.net; Mon, 21 Mar 2022 20:52:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWSkl-0000fb-NX for guix-patches@gnu.org; Mon, 21 Mar 2022 20:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWSkk-0002dE-PI for guix-patches@gnu.org; Mon, 21 Mar 2022 20:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWSkk-0006Wa-Hl for guix-patches@gnu.org; Mon, 21 Mar 2022 20:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54515] [PATCH] gnu: streamlink: Update to 3.2.0. Resent-From: Chadwain Holness Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Mar 2022 00:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54515@debbugs.gnu.org Cc: Chadwain Holness X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164791029825043 (code B ref -1); Tue, 22 Mar 2022 00:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2022 00:51:38 +0000 Received: from localhost ([127.0.0.1]:38828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWSkM-0006Vr-54 for submit@debbugs.gnu.org; Mon, 21 Mar 2022 20:51:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWSkI-0006Vh-Ft for submit@debbugs.gnu.org; Mon, 21 Mar 2022 20:51:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWSkI-0000Bh-8D for guix-patches@gnu.org; Mon, 21 Mar 2022 20:51:34 -0400 Received: from [2607:f8b0:4864:20::f29] (port=42936 helo=mail-qv1-xf29.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWSkF-0001pA-KA for guix-patches@gnu.org; Mon, 21 Mar 2022 20:51:33 -0400 Received: by mail-qv1-xf29.google.com with SMTP id e22so12721158qvf.9 for ; Mon, 21 Mar 2022 17:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iKIZtCc/Stp/FCmNDAtdFSr4Zwl6K/z3XmH093kh+s0=; b=oMBEB7aTC5M2KgSRzAEW31NeFqdIt7Jrq+iZGO7eHcNuSJX2nvl4SQ/mLQlrYHgO0E J7oSePcfovfaMx9YvVJFOeZU9dThAU+ZLgd80LgvOE6IakgttkQtBfxQfVo2Bm0hEZY9 hMQi7AB8Jc29/noGgiwOVvOOMjr8DQGuPQQZiT6drLoOUjz+Z0BmSHHI2vkr++O8MEOZ YGUM8lbVtaIo/1NgBaJJItjVmFblr4WrfjysGKLVkOWKZiqmN6gqgVKNtKH/Ka6Yo2T+ E3QVk97v2M5D6ScnL94/sW0zluOL8A32vlDKFRYqIg6eeoywmgbGZ11aOukV5c6bCFdE PTjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iKIZtCc/Stp/FCmNDAtdFSr4Zwl6K/z3XmH093kh+s0=; b=yY8PUxjVFLU1Mb2UTiwmHP9+F6IP3lWfUd4ISSPlAINpAF1H44+FsbO1idG5frnKCD YrtX2Hf8pAibPbbftZn77ESnnR9MD6dwMNCJGSmRpPAnCXc1oUSUSnXY7OfxID4ZrSup hUazQqI2ylVQit0lY0z8X2vcufYjTcJHQdXXkjy70hw3CyE/sbLy5B9CzwanfOGyz/zo Ujd6X6LXpgQgijeyxBacGR0OnC11tpKTOTet5ParNyVRZkwzCmYvThIAJ6SXOuvgVtH5 EIrSLoeTOZW1u63LCJerNc8HKSTc98fYQlDf3zF4TsjFMNUv3T5c3ox8xbFCv8WNEDjK Biqw== X-Gm-Message-State: AOAM5304Ze2f3j7kEDoxKd4zkfrLwBVHANa3YmmF8pe3vArPyWP9j7on PHXS2M/XOOP5rCujiL5R6hzs7L+8u6o= X-Google-Smtp-Source: ABdhPJz428VzV/A96N+3DbfYxKzljYGYy3Qu71JfxZwd8octO33LBqJuE9LDRkQqbrUPZkuSY3NhVw== X-Received: by 2002:ad4:5f8e:0:b0:441:3dbf:15d5 with SMTP id jp14-20020ad45f8e000000b004413dbf15d5mr2584087qvb.108.1647910287673; Mon, 21 Mar 2022 17:51:27 -0700 (PDT) Received: from chad-artix.hsd1.fl.comcast.net ([2601:586:8380:3be0::5de3]) by smtp.gmail.com with ESMTPSA id p17-20020a37a611000000b0067b2b2c41fasm8540491qke.81.2022.03.21.17.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 17:51:27 -0700 (PDT) From: Chadwain Holness Date: Mon, 21 Mar 2022 20:49:55 -0400 Message-Id: <20220322004955.16156-1-chadwainholness@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f29 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f29; envelope-from=chadwainholness@gmail.com; helo=mail-qv1-xf29.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (streamlink): Update to 3.2.0. [inputs]: Add python-lxml and python-pycountry, remove python-iso3166 and python-iso639. [arguments]<#:phases>{check}: Use pytest and skip some failing tests. * gnu.packages/xml.scm (python-lxml): Update to 4.7.1. --- gnu/packages/video.scm | 23 +++++++++++++++++------ gnu/packages/xml.scm | 4 ++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..a9ba40e302 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Bird ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Chadwain Holness ;;; ;;; This file is part of GNU Guix. ;;; @@ -3135,28 +3136,38 @@ (define-public xvid (define-public streamlink (package (name "streamlink") - (version "2.0.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "streamlink" version)) (sha256 (base32 - "1nv2kj1k42a1b20ws8sdzlxk3wh1qz6pg5mxp75433b3c7lxksn0")))) + "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p")))) (build-system python-build-system) - (home-page "https://github.com/streamlink/streamlink") + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-failing-tests + (lambda _ (substitute* "tests/utils/test_l10n.py" + (("^import streamlink" all) + (string-append "import pytest\n" all)) + (("(\\s*)def (test_equivalent|test_equivalent_remap|test_get_language|test_language_a3_no_a2|test_language_en)\\b" all indent) + (string-append indent "@pytest.mark.skip(\"Skipped by Guix.\")\n" all))))) + (replace 'check + (lambda _ (invoke "python" "-m" "pytest")))))) (native-inputs - (list python-freezegun python-pytest python-mock + (list python-freezegun python-mock python-pytest python-requests-mock)) (propagated-inputs (list python-pysocks python-websocket-client - python-iso3166 - python-iso639 python-isodate + python-lxml + python-pycountry python-pycryptodome python-requests python-urllib3)) + (home-page "https://github.com/streamlink/streamlink") (synopsis "Extract streams from various services") (description "Streamlink is command-line utility that extracts streams from sites like Twitch.tv and pipes them into a video player of choice.") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 49275c3e0c..50f552e048 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2500,13 +2500,13 @@ (define-public python-elementpath (define-public python-lxml (package (name "python-lxml") - (version "4.6.3") + (version "4.7.1") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 - (base32 "0s14r1w2x9sdlcsw8mxiqgw4rz5zs5lpqpxrfyn4a1mkndqqbdrr")) + (base32 "090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1")) ;; Adapt a test to libxml2 2.9.12, taken from this commit: ;; https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047e (modules '((guix build utils)))