Subject: [PATCH] gnu: gpodder: Update to 3.10.18.
From: Pierre Langlois <[email-masked]>
To: Guix-patches <[email-masked]>
Date: Sun, 11 Apr 2021 13:33:18 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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

From b623b508197261a6d13015b20678d073266b7c12 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <[email-masked]>
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 © 2016, 2017, 2018, 2019, 2020 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017, 2018, 2020 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2018 Fis Trivial <[email-masked]>
-;;; Copyright © 2019 Pierre Langlois <[email-masked]>
+;;; Copyright © 2019, 2021 Pierre Langlois <[email-masked]>
 ;;; Copyright © 2019 Chris Marusich <[email-masked]>
 ;;; Copyright © 2020 Lars-Dominik Braun <[email-masked]>
 ;;; Copyright © 2020 Brice Waegeneire <[email-masked]>
@@ -1132,6 +1132,38 @@ supports coverage of subprocesses.")
 (define-public python2-pytest-cov
   (package-with-python2 python-pytest-cov))
 
+(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")
-- 
2.31.1

From c65bf4cc07b49dd04009eda3eeaa9056739b3452 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <[email-masked]>
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 © 2019, 2020 Pierre Langlois <[email-masked]>
+;;; Copyright © 2019, 2020, 2021 Pierre Langlois <[email-masked]>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; 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)
-- 
2.31.1