From unknown Sat Jun 14 18:53:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47707] [PATCH] gnu: gpodder: Update to 3.10.18. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Apr 2021 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47707@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.161814441711837 (code B ref -1); Sun, 11 Apr 2021 12:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2021 12:33:37 +0000 Received: from localhost ([127.0.0.1]:54131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVZHR-00034o-DE for submit@debbugs.gnu.org; Sun, 11 Apr 2021 08:33:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:45002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVZHL-00034b-8f for submit@debbugs.gnu.org; Sun, 11 Apr 2021 08:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVZHK-0003QN-RU for guix-patches@gnu.org; Sun, 11 Apr 2021 08:33:27 -0400 Received: from mout.gmx.net ([212.227.17.21]:49921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVZHH-00063z-HF for guix-patches@gnu.org; Sun, 11 Apr 2021 08:33:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1618144400; bh=N4uxPSrRPk9+KaAuZS9cn3LCVIx8arEkkA0e1G44kjA=; h=X-UI-Sender-Class:From:To:Subject:Date; b=WD/gMhSbjs79joosL3Yf1sDDR+TDi7e1VohFBLR2o7GYLVcUL7aYNbJodX2Z/TYHh ZZxEC7yT68Lcwi8L7PM8QqAp8xT3WS7aXsyiQJPB1QPp3i5MIP0vEFcjZlZJ+MXnnq wkkhkRXERtSwWLx8kUpsNaFKGU0dZsxnQFwfxw8A= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MzhjF-1liqzx07BB-00vbpU for ; Sun, 11 Apr 2021 14:33:20 +0200 User-agent: mu4e 1.4.15; emacs 27.2 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:33:18 +0100 Message-ID: <87h7kdxapd.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:c9mNkfycaz16lQeT+AQ0sNkRww3G4/AnP5WXwv1fjHmq9gQdYL+ eetFjHibbFa4n6LTDpSShNYC7FWm5oBkfpyYLUUlnYkItyGHEcG+gftLNVbk5nHp/mIbAyp irMfbJk89AgbTtjZlCA+qYzjYoaLiW7o4Fb7dEyZ0+70OXjKNujanpD/mrRYVvw11t3Gktp 3Rj7ASKzRC/gN85+nJPQA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:sFTAGvwqIEY=:/nGqxlLZJ+AXB89tNsPLpJ KaownIRepjFuhQSqazS/SVv5yOFoGcADrg76IPjaO/6BZm+5HaY7KJsO9ojuI1jfCbihvzhz/ 3eL/2DvljEprCKMupRyloG+42/uE+QZZv0T0GGzDreqa3KhRDBU2dLTi08L74GCFCLBOSTeJe PnOc37vvihmAXd41Re8S2Y0Q+32p6aQZdEFjyq/3KJCwXL7gO+NfuQMfFj7PbF8gNwjHjijoW Al0KUi3/Oa1BBgYBBcdraSmvAtOILCIoUh/CWWFKsiNLp5vQor9wtLlDwEz2S5HPsG65aYKum KKolol2N2E4Jq8PYSDtr7IChU9VRLfJoolEQZadhMX3fnQ1kWpO7KiTh3Ti9vyLx1zRmFxKuu hoFVtIUEFQAXp3XyM2Y5Gfjxcuri1jkfv6MXt4NOSHZpIak6LrvyByUSeBW7t6wEDAojzkZij pZwTfvs3/ZhGxkEVpyp4jvIIl3LNyr5gr68BJLS8qWc70PYvwMmct05Yhup7I2+AyDDddzi4G BtVO4tsW0X7Tq9OUhiRxFkK/b3qMtKpezArsHYpEDDkvOwBcj7SCOMWCejAjhW+J078GgGNf/ wokvl+doWxSe5pGDSsurk9jvbKaCni3kvVxWAYoZGurSfJpu+dUO509YDXMuj/1r6ontd9ZzL cLlnLMig0P0lEn1no2H33IKrEuAbOGRUsPDG1cE0pzCqHkAIOBTIhgrPGUbqx9O7eesGKzp2T 5Ym3p491DOJ6iGTW8Jp1g9Ow8n2Gm8Qf0eROMrOeK2ya2SL3p7sRxHSV+xMgUV0MCtnBwZ4dF gwUDAsTe3ue8DfaCHv26S0UJv5nxkhZkGXHbqROshoqQx+FmnHdwkJfnHcD5PIc7aHygag2QV JmYBm7/oB+QRrh27czKFMYMfBotrX5n5Y/rqv/QHMnCQWLQYUEuGu+2FJ4OC2rT6/2hAWbbgE VM6OUt2gtHnmMVwUJQcdVd4xqXJNmpFIEZ5fYPrF0ZbcMz2FjqLsacMApmjpudgIy7nbQTccx ZJfmcnAkEQVbKyEWr1x7K/rjCL5IFAnjdlyuVYSaPpaF766fnCFW8qZQoxj8n0tfa27Zsvilw RaqKSC0juyYvlm/KbyetlfkjcV592blC48JhLe7GQcQweVyEwT4pkE/cU9N/om5Kng0jtLGLR SnEtTlH52KS8K/W4AQQ6D5/NJ85DjEGnBtAqswZbhuM9cCiSb7OZ4CgqzUC07A3l8uvJee8Gm 6DBYAgEq2OVAv8Jh0 Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi Guix! Here are a couple of patches to update gpodder, which now uses python-requests and needs pytest-httpserver to run some HTTP tests. OK to apply? Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBy7I4YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UIycH/Ag3yD7l1k81AeBnHMI6gExs cvXLK7tZ/mv9+yCLzsXBahJ1zvCvz82NbzRTlsoOPoahhhytdPrXPhzgrXa0nTKb mW8ddGiD4yw49g/efp7M0C0E0Fq13PhfF0olJ13OlKAegB/4lKERA92F0YueJdI0 NZDOiEt3ktO6yiZa+Ek2x02SrDX1F3litwv/S8xLdShnaqYWAl6Pppc2wMMB+VMS miZJkk3LVx+uPc3NNMjzL+1xJdhVzlfCioVsujyQO+QBTB1zYTfacoMZRBY1AL8T i/T29hclGKWdvMzwX62lUkLevF1sRQtJYLhPtEq45tknUdgDIRklIz0+prsUdNA= =Wz/P -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-python-pytest-httpserver.patch Content-Transfer-Encoding: quoted-printable >From b623b508197261a6d13015b20678d073266b7c12 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:10:15 +0100 Subject: [PATCH 1/2] gnu: Add python-pytest-httpserver. * gnu/packages/check.scm (python-pytest-httpserver): New variable. --- gnu/packages/check.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7c95ea6950..4cb6899e2e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -28,7 +28,7 @@ ;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright =C2=A9 2017, 2018, 2020 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Fis Trivial -;;; Copyright =C2=A9 2019 Pierre Langlois +;;; Copyright =C2=A9 2019, 2021 Pierre Langlois ;;; Copyright =C2=A9 2019 Chris Marusich ;;; Copyright =C2=A9 2020 Lars-Dominik Braun ;;; Copyright =C2=A9 2020 Brice Waegeneire @@ -1132,6 +1132,38 @@ supports coverage of subprocesses.") (define-public python2-pytest-cov (package-with-python2 python-pytest-cov)) =20 +(define-public python-pytest-httpserver + (package + (name "python-pytest-httpserver") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest_httpserver" version)) + (sha256 + (base32 + "0vbls0j570l5my83j4jnk5blmnir44i0w511azlh41nl6k8rac5f")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-werkzeug" ,python-werkzeug))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-library-loading + (lambda _ + (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") ":.= ")) + #t)) + (replace 'check + (lambda _ + (invoke "pytest" "tests" "-vv") + (invoke "pytest" "tests" "-vv" "--ssl")))))) + (home-page "https://github.com/csernazs/pytest-httpserver") + (synopsis "HTTP server for pytest") + (description "Pytest plugin library to test http clients without +contacting the real http server.") + (license license:expat))) + (define-public python-pytest-runner (package (name "python-pytest-runner") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-gpodder-Update-to-3.10.18.patch Content-Transfer-Encoding: quoted-printable >From c65bf4cc07b49dd04009eda3eeaa9056739b3452 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:24:03 +0100 Subject: [PATCH 2/2] gnu: gpodder: Update to 3.10.18. * gnu/packages/gpodder.scm (gpodder): Update to 3.10.18. [native-inputs]: Add python-pytest, python-pytest-cov, python-pytest-httpserver and which. [inputs]: Add python-requests. --- gnu/packages/gpodder.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 44c356e2ff..c4dc50c2f9 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2019, 2020 Pierre Langlois +;;; Copyright =C2=A9 2019, 2020, 2021 Pierre Langlois ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -25,6 +25,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -38,7 +39,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.17") + (version "3.10.18") (source (origin (method git-fetch) @@ -46,18 +47,23 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd")) + (base32 "1d73q46sqandzbn74nfw9bzzah99z91wsxq2hcivwdgnsv2g2d8y")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) ("python-coverage" ,python-coverage) - ("python-minimock" ,python-minimock))) + ("python-minimock" ,python-minimock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-httpserver" ,python-pytest-httpserver) + ("which" ,which))) (inputs `(("gtk+" ,gtk+) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) + ("python-requests" ,python-requests) ("python-dbus" ,python-dbus) ("python-html5lib" ,python-html5lib) ("python-mygpoclient" ,python-mygpoclient) --=20 2.31.1 --=-=-=-- From unknown Sat Jun 14 18:53:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#47707] [PATCH] gnu: gpodder: Update to 3.10.18. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Apr 2021 14:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Langlois , 47707@debbugs.gnu.org Received: via spool by 47707-submit@debbugs.gnu.org id=B47707.161815237625845 (code B ref 47707); Sun, 11 Apr 2021 14:47:02 +0000 Received: (at 47707) by debbugs.gnu.org; 11 Apr 2021 14:46:16 +0000 Received: from localhost ([127.0.0.1]:55708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVbLs-0006im-IQ for submit@debbugs.gnu.org; Sun, 11 Apr 2021 10:46:16 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:51896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVbLq-0006ie-VB for 47707@debbugs.gnu.org; Sun, 11 Apr 2021 10:46:15 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id rSmC2400P0mfAB401SmD9X; Sun, 11 Apr 2021 16:46:13 +0200 Message-ID: From: Maxime Devos Date: Sun, 11 Apr 2021 16:46:07 +0200 In-Reply-To: <87h7kdxapd.fsf@gmx.com> References: <87h7kdxapd.fsf@gmx.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-AGiaiRkZ2pBjIVd7Rt9h" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1618152373; bh=6WC9LxsGviuooxaDwzvuhFb8NEXTa7WNKyGgb1FfDXM=; h=Subject:From:To:Date:In-Reply-To:References; b=JiomYZMeUyhV6/+f3COxBqOvIGkUP+HVexs0CC0GV98D3q6VHLtitdr0/dzmc8wH9 bHVdmklh8UIjqaKAXVcrxUMXgKOXk7xHBWvNL2OKIhE8bEEUkAj/39m5D9/uGjeCCG VqYidzqtPN7HAGOpTiQ50IbU11ZQejjsgw5ZJTjldhuDzXWvWg/ddAEck+UMVg5yqC K5+qTKbEIKzfuNZ+IExucwkL33M/lugltZHynvnJLmCOBwXdf1zvTmEuRhVWi1W5bB Yssdz6GhJcfcQ9dQThIParOxfYsynKkHKmXRgs2619lc2ia4nb7YMKXTmFn+34OW47 5yyWIQh+aqzMQ== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-AGiaiRkZ2pBjIVd7Rt9h Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > + (modify-phases %standard-phases > + (add-before 'check 'fix-library-loading > + (lambda _ > + (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") "= :.")) > + #t)) Returning #t is not required anymore, please remove. The warning that resu= lts if a phase doesn't return #t has been removed on core-updates. No other comments, thanks for updating. Warning: I haven't tested the patch. Greetings, Maxime. --=-AGiaiRkZ2pBjIVd7Rt9h Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHMLrxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7i9wAQC5hhFWt/OM93XZtUUxAIBg2Qcl usYS23XvcrOD/Y2MDAD9H9b863AORvxfchBucKXKeSzSuN+RyBM1agXRBVoZSgI= =5PMq -----END PGP SIGNATURE----- --=-AGiaiRkZ2pBjIVd7Rt9h-- From unknown Sat Jun 14 18:53:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Pierre Langlois Subject: bug#47707: closed (Re: [bug#47707] [PATCH] gnu: gpodder: Update to 3.10.18.) Message-ID: References: <878s5oyije.fsf@gmx.com> <87h7kdxapd.fsf@gmx.com> X-Gnu-PR-Message: they-closed 47707 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 47707@debbugs.gnu.org Date: Sun, 11 Apr 2021 14:59:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1618153141-26939-1" This is a multi-part message in MIME format... ------------=_1618153141-26939-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #47707: [PATCH] gnu: gpodder: Update to 3.10.18. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 47707@debbugs.gnu.org. --=20 47707: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D47707 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1618153141-26939-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 47707-done) by debbugs.gnu.org; 11 Apr 2021 14:58:56 +0000 Received: from localhost ([127.0.0.1]:55712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVbY7-00070C-Ne for submit@debbugs.gnu.org; Sun, 11 Apr 2021 10:58:55 -0400 Received: from mout.gmx.net ([212.227.15.19]:44035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVbY5-0006zw-E9 for 47707-done@debbugs.gnu.org; Sun, 11 Apr 2021 10:58:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1618153126; bh=lNkVacONE7Hjj7kxym0l/45+UmHUoFiF2kVBK7BFljI=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=lclT98GLGsZa0xCbkqsu+qayY1bVLiEGOrk2d5DFMmwSEVVthvy4p5NoobC6g9WIC FTN8MrcAze3TXwquOeOS2JrVSyrhb3U1yfrFE/8QMGDnO5b295b931+185g+iwZ59v vSG88V2Mo9XjbuTcbgfVyLZnqRatD54eu7QZOp7E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MNt0M-1lBsqM19Lc-00OIoB; Sun, 11 Apr 2021 16:58:46 +0200 References: <87h7kdxapd.fsf@gmx.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Pierre Langlois To: Maxime Devos Subject: Re: [bug#47707] [PATCH] gnu: gpodder: Update to 3.10.18. In-reply-to: Date: Sun, 11 Apr 2021 15:58:45 +0100 Message-ID: <878s5oyije.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:5cK6pPv9Ejag2vj1H5r/t9B0Vy0hAkemE6HF3e2zkKLBTp0Dwre Bicb0Ov1+Atc2pOk0Uerbq27Qeu1wW+ehwJqwT26/toO3tBUvegRFYDoO+NCe29dnfqxOVd hptGpwEdPh4gijgBohOmaKjCe5dBsqQDdX23VSb9aoaYIOQgL4PzhFeZvLRnZtweaIypVAP lJdeb0aQ+LwFghB97+CEg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:5aGEPa25EZY=:Oc5BvN28b5EAgeHmVbP1/F rJG+BM2fbdgg9v48KX7CV6T3IfixtI8ax1butSU0fTF4yICc/snkNTNi3YGKGmvXjZy+Hd6FT nKvkJPkq4xV+fL3+Ok0QtAySiU9OM7NIW0yQT4h+kF247Rp8cpaQQim+kyXcxTTAn1uUCm98z g9O2DdSdtqwjqCHhLDAWLBfi0wmlkKheehLTSH4OCRpR4CDLbq7ITz1qvnMkWjneBP9i7YEeU w2lIY1qcm+GxFdR/9RPbBwSfZTqZEtggcSiPdsL4qsKPpynOBYp8UrHHV+n0IjORwaKOFR/YH 58To4r/1N4y8l5I3L8ym3ifHIXn+NG6OE5kxZ3IsYAdOtaAlxLKGH76YU78fBlmdyFR+j7A0a ftvMwNnPqqzeksK6p9b7KWy/xQ/E8k3XzWRYcqXg1jsTn8seYu86JtawpLgeNdFmXL5zkQrMo KTkddLanJLybGuBDbAVxZvKS9taMpWHM9JCgDtqSgFjyqBV36fr2ga6Tp0ZulR2aThl5PvG+Z bCnDZSph7ClQFzOS2o+LWqqGHIcky/sQjDcKkKrN6gvST0t38HTLP0xHNWKuGOEJvC0sGVTF7 zSLc4znt8cA0DK3Df+uuWEnnM1TZLg3/GEfyeOkP4VZtkeRGyWIwPRAeKbsATsrd9IQiRv3Y3 ynon5WHqtXmuailMVGfWDRqXJdQFTHBBxH9qiJxamZvnmCl+qe4V9ovtbZRNwRSqI8Ie5iatb MXtpbA/di+oKIJ+0b5FtIKQdM6Zi7D5fIEUMXJUQWUShU2YHDnJC3ScJUok5Z9YGGdTqUFaFz Ywo0GgRpSU9KCl7DhZyA/k+i9jHqvV6u19GkxQdD7QTvxdOr/3CtNgtsZOFh9Ps1Li8JnN8T/ N4XNhqNVLcvqk8ea691a2qb454aomlFCCmZLQRbbNJ7BE06D375mAh6tzT8N9Gb7iDsDR7vnh 7ob/U+9rvYdJiKB/E+fMzo0iPk7pb+4pQmpxsF2yIutSE3UkksmqrFk2qUgBvIp1yWykRzFYW eyHiQpmn4pTIw1OG5E+X0WXYypGTC5n3kwejU3koANH+Mh5p4MBCSHC5A25EOrS+21krZ3dRR xmawfZ7kRuguMa08xzscuF7Omgo4Cqm475AgHtSQsLi8s9gwWQTlaUaZ6OdA+pqtzyWFyuI6u 93I9gDReYhxBNpBeW+GzO/fjHPYoFUInUXPNUjZDi2d1acOG1emApmV+eHthfudb6XaFP7sAs HO6ZdXEzSHvxnfMw6 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47707-done Cc: Pierre Langlois , 47707-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Hi Maxime, Maxime Devos writes: >> + (modify-phases %standard-phases >> + (add-before 'check 'fix-library-loading >> + (lambda _ >> + (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") ":.")) >> + #t)) > > Returning #t is not required anymore, please remove. The warning that results if > a phase doesn't return #t has been removed on core-updates. Oh cool, done, going to have to get rid of the habit of adding it :-). > > No other comments, thanks for updating. > Warning: I haven't tested the patch. Thanks for the review! Pushed with fca8ef0d765f47faed88100e3c9734cfab3768cd. Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBzDqUYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UQUQH/Rnq45nrCWM3c2eCu403Munv sEuvyzj0zwJjOxqSZeVw1EKbIUSlSVC54QOZsQtk3bzOXH3aNXbOY6NvYYAOccHn Z8WDJ5GxzplpJZvlXOkZzMVEjg2CTLKc1hzA/jkhqeJlGioFoGukRT/rsBdOsYhw LSk1uPZ3LKUqAq/vXD2tx/v6nua9YUhKNN3zlue7bZBKfbvsaHqrbNMZG3Q9TKz1 aVI6QwJ3dzto1aO4bK9VhwoTKnU9jUxld9urv9mWfXMyRdNU3Bc6uAC3hgHYyHhC lIqUezD3imk/mN1/gPnlZ8FOqwEcjsfdLTX3exY1PFKx8f9gF3ZVBIsMLXk+0hc= =qRZn -----END PGP SIGNATURE----- --=-=-=-- ------------=_1618153141-26939-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Apr 2021 12:33:37 +0000 Received: from localhost ([127.0.0.1]:54131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVZHR-00034o-DE for submit@debbugs.gnu.org; Sun, 11 Apr 2021 08:33:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:45002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVZHL-00034b-8f for submit@debbugs.gnu.org; Sun, 11 Apr 2021 08:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVZHK-0003QN-RU for guix-patches@gnu.org; Sun, 11 Apr 2021 08:33:27 -0400 Received: from mout.gmx.net ([212.227.17.21]:49921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVZHH-00063z-HF for guix-patches@gnu.org; Sun, 11 Apr 2021 08:33:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1618144400; bh=N4uxPSrRPk9+KaAuZS9cn3LCVIx8arEkkA0e1G44kjA=; h=X-UI-Sender-Class:From:To:Subject:Date; b=WD/gMhSbjs79joosL3Yf1sDDR+TDi7e1VohFBLR2o7GYLVcUL7aYNbJodX2Z/TYHh ZZxEC7yT68Lcwi8L7PM8QqAp8xT3WS7aXsyiQJPB1QPp3i5MIP0vEFcjZlZJ+MXnnq wkkhkRXERtSwWLx8kUpsNaFKGU0dZsxnQFwfxw8A= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MzhjF-1liqzx07BB-00vbpU for ; Sun, 11 Apr 2021 14:33:20 +0200 User-agent: mu4e 1.4.15; emacs 27.2 From: Pierre Langlois To: Guix-patches Subject: [PATCH] gnu: gpodder: Update to 3.10.18. Date: Sun, 11 Apr 2021 13:33:18 +0100 Message-ID: <87h7kdxapd.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:c9mNkfycaz16lQeT+AQ0sNkRww3G4/AnP5WXwv1fjHmq9gQdYL+ eetFjHibbFa4n6LTDpSShNYC7FWm5oBkfpyYLUUlnYkItyGHEcG+gftLNVbk5nHp/mIbAyp irMfbJk89AgbTtjZlCA+qYzjYoaLiW7o4Fb7dEyZ0+70OXjKNujanpD/mrRYVvw11t3Gktp 3Rj7ASKzRC/gN85+nJPQA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:sFTAGvwqIEY=:/nGqxlLZJ+AXB89tNsPLpJ KaownIRepjFuhQSqazS/SVv5yOFoGcADrg76IPjaO/6BZm+5HaY7KJsO9ojuI1jfCbihvzhz/ 3eL/2DvljEprCKMupRyloG+42/uE+QZZv0T0GGzDreqa3KhRDBU2dLTi08L74GCFCLBOSTeJe PnOc37vvihmAXd41Re8S2Y0Q+32p6aQZdEFjyq/3KJCwXL7gO+NfuQMfFj7PbF8gNwjHjijoW Al0KUi3/Oa1BBgYBBcdraSmvAtOILCIoUh/CWWFKsiNLp5vQor9wtLlDwEz2S5HPsG65aYKum KKolol2N2E4Jq8PYSDtr7IChU9VRLfJoolEQZadhMX3fnQ1kWpO7KiTh3Ti9vyLx1zRmFxKuu hoFVtIUEFQAXp3XyM2Y5Gfjxcuri1jkfv6MXt4NOSHZpIak6LrvyByUSeBW7t6wEDAojzkZij pZwTfvs3/ZhGxkEVpyp4jvIIl3LNyr5gr68BJLS8qWc70PYvwMmct05Yhup7I2+AyDDddzi4G BtVO4tsW0X7Tq9OUhiRxFkK/b3qMtKpezArsHYpEDDkvOwBcj7SCOMWCejAjhW+J078GgGNf/ wokvl+doWxSe5pGDSsurk9jvbKaCni3kvVxWAYoZGurSfJpu+dUO509YDXMuj/1r6ontd9ZzL cLlnLMig0P0lEn1no2H33IKrEuAbOGRUsPDG1cE0pzCqHkAIOBTIhgrPGUbqx9O7eesGKzp2T 5Ym3p491DOJ6iGTW8Jp1g9Ow8n2Gm8Qf0eROMrOeK2ya2SL3p7sRxHSV+xMgUV0MCtnBwZ4dF gwUDAsTe3ue8DfaCHv26S0UJv5nxkhZkGXHbqROshoqQx+FmnHdwkJfnHcD5PIc7aHygag2QV JmYBm7/oB+QRrh27czKFMYMfBotrX5n5Y/rqv/QHMnCQWLQYUEuGu+2FJ4OC2rT6/2hAWbbgE VM6OUt2gtHnmMVwUJQcdVd4xqXJNmpFIEZ5fYPrF0ZbcMz2FjqLsacMApmjpudgIy7nbQTccx ZJfmcnAkEQVbKyEWr1x7K/rjCL5IFAnjdlyuVYSaPpaF766fnCFW8qZQoxj8n0tfa27Zsvilw RaqKSC0juyYvlm/KbyetlfkjcV592blC48JhLe7GQcQweVyEwT4pkE/cU9N/om5Kng0jtLGLR SnEtTlH52KS8K/W4AQQ6D5/NJ85DjEGnBtAqswZbhuM9cCiSb7OZ4CgqzUC07A3l8uvJee8Gm 6DBYAgEq2OVAv8Jh0 Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi Guix! Here are a couple of patches to update gpodder, which now uses python-requests and needs pytest-httpserver to run some HTTP tests. OK to apply? Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBy7I4YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UIycH/Ag3yD7l1k81AeBnHMI6gExs cvXLK7tZ/mv9+yCLzsXBahJ1zvCvz82NbzRTlsoOPoahhhytdPrXPhzgrXa0nTKb mW8ddGiD4yw49g/efp7M0C0E0Fq13PhfF0olJ13OlKAegB/4lKERA92F0YueJdI0 NZDOiEt3ktO6yiZa+Ek2x02SrDX1F3litwv/S8xLdShnaqYWAl6Pppc2wMMB+VMS miZJkk3LVx+uPc3NNMjzL+1xJdhVzlfCioVsujyQO+QBTB1zYTfacoMZRBY1AL8T i/T29hclGKWdvMzwX62lUkLevF1sRQtJYLhPtEq45tknUdgDIRklIz0+prsUdNA= =Wz/P -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-python-pytest-httpserver.patch Content-Transfer-Encoding: quoted-printable >From b623b508197261a6d13015b20678d073266b7c12 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:10:15 +0100 Subject: [PATCH 1/2] gnu: Add python-pytest-httpserver. * gnu/packages/check.scm (python-pytest-httpserver): New variable. --- gnu/packages/check.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7c95ea6950..4cb6899e2e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -28,7 +28,7 @@ ;;; Copyright =C2=A9 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright =C2=A9 2017, 2018, 2020 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Fis Trivial -;;; Copyright =C2=A9 2019 Pierre Langlois +;;; Copyright =C2=A9 2019, 2021 Pierre Langlois ;;; Copyright =C2=A9 2019 Chris Marusich ;;; Copyright =C2=A9 2020 Lars-Dominik Braun ;;; Copyright =C2=A9 2020 Brice Waegeneire @@ -1132,6 +1132,38 @@ supports coverage of subprocesses.") (define-public python2-pytest-cov (package-with-python2 python-pytest-cov)) =20 +(define-public python-pytest-httpserver + (package + (name "python-pytest-httpserver") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest_httpserver" version)) + (sha256 + (base32 + "0vbls0j570l5my83j4jnk5blmnir44i0w511azlh41nl6k8rac5f")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-werkzeug" ,python-werkzeug))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-library-loading + (lambda _ + (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") ":.= ")) + #t)) + (replace 'check + (lambda _ + (invoke "pytest" "tests" "-vv") + (invoke "pytest" "tests" "-vv" "--ssl")))))) + (home-page "https://github.com/csernazs/pytest-httpserver") + (synopsis "HTTP server for pytest") + (description "Pytest plugin library to test http clients without +contacting the real http server.") + (license license:expat))) + (define-public python-pytest-runner (package (name "python-pytest-runner") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-gpodder-Update-to-3.10.18.patch Content-Transfer-Encoding: quoted-printable >From c65bf4cc07b49dd04009eda3eeaa9056739b3452 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:24:03 +0100 Subject: [PATCH 2/2] gnu: gpodder: Update to 3.10.18. * gnu/packages/gpodder.scm (gpodder): Update to 3.10.18. [native-inputs]: Add python-pytest, python-pytest-cov, python-pytest-httpserver and which. [inputs]: Add python-requests. --- gnu/packages/gpodder.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 44c356e2ff..c4dc50c2f9 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2019, 2020 Pierre Langlois +;;; Copyright =C2=A9 2019, 2020, 2021 Pierre Langlois ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -25,6 +25,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -38,7 +39,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.17") + (version "3.10.18") (source (origin (method git-fetch) @@ -46,18 +47,23 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd")) + (base32 "1d73q46sqandzbn74nfw9bzzah99z91wsxq2hcivwdgnsv2g2d8y")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) ("python-coverage" ,python-coverage) - ("python-minimock" ,python-minimock))) + ("python-minimock" ,python-minimock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-httpserver" ,python-pytest-httpserver) + ("which" ,which))) (inputs `(("gtk+" ,gtk+) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) + ("python-requests" ,python-requests) ("python-dbus" ,python-dbus) ("python-html5lib" ,python-html5lib) ("python-mygpoclient" ,python-mygpoclient) --=20 2.31.1 --=-=-=-- ------------=_1618153141-26939-1--