From 05b4b3ea05b2a9e0c769fe3418c54a2819447a25 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 4 Feb 2019 11:45:13 +0100
Subject: gnu: python-prometheus-client: Remove duplicate.

* gnu/packages/monitoring.scm (python-prometheus-client): Update to 0.5.0.
* gnu/packages/python-xyz.scm (python-prometheus-client,
python2-prometheus-client): Remove variables.
---
 gnu/packages/monitoring.scm |  8 +++++---
 gnu/packages/python-xyz.scm | 25 -------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index a638dd7c80..4384406227 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
-;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
@@ -371,18 +371,20 @@ (define-public python2-graphite-web
 (define-public python-prometheus-client
   (package
     (name "python-prometheus-client")
-    (version "0.1.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "prometheus_client" version))
        (sha256
         (base32
-         "164qzzg8q8awqk0angcm87p2sjiibaj1wgjz0xk6j0klvqi5q2mz"))))
+         "0g7rpv1pq2lab1nfqdx98z9d3bqwc400alg1j4ynrpjkrbsizhg8"))))
     (build-system python-build-system)
     (arguments
      '(;; No included tests.
        #:tests? #f))
+    (propagated-inputs
+     `(("python-twisted" ,python-twisted)))
     (home-page
      "https://github.com/prometheus/client_python")
     (synopsis "Python client for the Prometheus monitoring system")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 992a750911..ae3e005be2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6732,31 +6732,6 @@ (define-public python-nbconvert
 (define-public python2-nbconvert
   (package-with-python2 python-nbconvert))
 
-(define-public python-prometheus-client
-  (package
-    (name "python-prometheus-client")
-    (version "0.5.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "prometheus_client" version))
-       (sha256
-        (base32
-         "0g7rpv1pq2lab1nfqdx98z9d3bqwc400alg1j4ynrpjkrbsizhg8"))))
-    (build-system python-build-system)
-    (arguments '(#:tests? #f)) ; tests are not included
-    (propagated-inputs
-     `(("python-twisted" ,python-twisted)))
-    (home-page "https://github.com/prometheus/client_python")
-    (synopsis "Python client for the Prometheus monitoring system")
-    (description
-     "This package provides a Python client for the Prometheus monitoring
-system.")
-    (license license:asl2.0)))
-
-(define-public python2-prometheus-client
-  (package-with-python2 python-prometheus-client))
-
 (define-public python-notebook
   (package
     (name "python-notebook")
-- 
cgit v1.2.3