From patchwork Tue Mar 22 17:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chadwain Holness X-Patchwork-Id: 38006 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 4B36827BBE9; Tue, 22 Mar 2022 17:12:24 +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.6 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, URIBL_SBL_A 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 885DC27BBEA for ; Tue, 22 Mar 2022 17:12:21 +0000 (GMT) Received: from localhost ([::1]:45650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWi3Q-00044W-JC for patchwork@mira.cbaines.net; Tue, 22 Mar 2022 13:12:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWi39-00041Z-76 for guix-patches@gnu.org; Tue, 22 Mar 2022 13:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWi38-0004uP-RY for guix-patches@gnu.org; Tue, 22 Mar 2022 13:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWi38-0007N6-Iw for guix-patches@gnu.org; Tue, 22 Mar 2022 13:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54515] [PATCH v3] 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 17:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54515@debbugs.gnu.org, maximedevos@telenet.be Cc: Chadwain Holness Received: via spool by 54515-submit@debbugs.gnu.org id=B54515.164796910928314 (code B ref 54515); Tue, 22 Mar 2022 17:12:02 +0000 Received: (at 54515) by debbugs.gnu.org; 22 Mar 2022 17:11:49 +0000 Received: from localhost ([127.0.0.1]:41768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWi2u-0007Mb-JI for submit@debbugs.gnu.org; Tue, 22 Mar 2022 13:11:49 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:35416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWi2t-0007MO-CI for 54515@debbugs.gnu.org; Tue, 22 Mar 2022 13:11:47 -0400 Received: by mail-qv1-f52.google.com with SMTP id kl29so7872225qvb.2 for <54515@debbugs.gnu.org>; Tue, 22 Mar 2022 10:11:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=rf4Og/PUETB5DeUvbGS2f8k4nbKu5OyO8eq30RVAUG4=; b=Ufoap0TQAb59m8xpxovA7IIlbFBCvypRkm1+wjtO39rvNmrYWtYnRqamHrBf63787I p0mgUjybNvG7KkpT5UFIicJGvKetuMLlwGj3EEl16zGbcxi5irkJfOQ/SVv8ak8RbYUO XjsKQi+R/Z4DvfsfIX4NKxGwpVFrlR73jA3izw7nsnCT/1b11TVy9Q4E6YfT0uIFj3nA n+wMQwfFe3GYQYWZSNOiUmkhX/eiu3Q8nteF5IutGXiLjrvnhWnkRxtjPFRdWQ637bjB kCq57h4UdzTG99j4qLQaC5v0kOkVUDL++Y9OOy9vdPK74qk/WXUmlLcbs1MJDBGfaB9C yhvQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rf4Og/PUETB5DeUvbGS2f8k4nbKu5OyO8eq30RVAUG4=; b=iczPZqru/f2ddbxDNZ0Oi5GLL1A023W/Ig4WwzqomdwbQ5XQCrhZg1XWqjtvKtZOwz VtsSZyccYd/zU5CQjzcZSHtGJIRC+73JA8FhKuu9jn+Qj+8PplHmdLcEvYJLRVR8vHsT t6Bbp0PgA+s3BK3IAYFEs8Q5Qv7r1vg+fhzg8RLYraLBASYbqT3QBr45rAm6HAC7I/fv weZ2WErbDUKxlAKSZPjanpP+jWq1HW6QkfVa0iv3E6ctlPIlze0JelqfFf9zH6rYmYKg tEjPQOCO4m+1A6GgHI76eQ8XpTGxnspNAOzsyJ4eonNY0xtgBfyARY+TtrOdE5Wu7/OH zCAg== X-Gm-Message-State: AOAM5337lMGUIdX/JBRPJJzAtjZ50DP5Bp1XiWElrsD/GlURNi/0Hkcx tacxs5mT2olgxHoioKGcXwmWrnu0hb3N3Q== X-Google-Smtp-Source: ABdhPJw9FCG8cV919/dRcg3brXCfeAlYbOwym9/5DsTS7HGCnijIdpjP+KR7bvELXZJ7wkz7tP6Djg== X-Received: by 2002:ad4:5ce3:0:b0:440:d9a7:912d with SMTP id iv3-20020ad45ce3000000b00440d9a7912dmr19962999qvb.74.1647969101033; Tue, 22 Mar 2022 10:11:41 -0700 (PDT) Received: from chad-artix.hsd1.fl.comcast.net ([2601:586:8380:3be0::d384]) by smtp.gmail.com with ESMTPSA id q13-20020ac8410d000000b002e1b59b2492sm12863483qtl.88.2022.03.22.10.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 10:11:40 -0700 (PDT) From: Chadwain Holness Date: Tue, 22 Mar 2022 13:11:52 -0400 Message-Id: <20220322171151.7337-1-chadwainholness@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <962b8222f7c30990f7e0058548795fc3328bcf7b.camel@telenet.be> References: <962b8222f7c30990f7e0058548795fc3328bcf7b.camel@telenet.be> 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" 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. * gnu.packages/xml.scm (python-lxml): Update to 4.7.1. (python-pycountry): Update to 22.3.5. Sorry thought I included this change before --- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/video.scm | 19 +++++++++++++------ gnu/packages/xml.scm | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7649dd0ad5..dd18fbc65c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18414,14 +18414,14 @@ (define-public python-ddt (define-public python-pycountry (package (name "python-pycountry") - (version "18.5.26") + (version "22.3.5") (source (origin (method url-fetch) (uri (pypi-uri "pycountry" version)) (sha256 (base32 - "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz")))) + "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj")))) (build-system python-build-system) (home-page "https://bitbucket.org/flyingcircus/pycountry") (synopsis "ISO databases for languages, countries, currencies, etc.") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..dab1d9c907 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,34 @@ (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 + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (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)))