From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MpPdEmjcXF/gXgAA0tVLHw (envelope-from ) for ; Sat, 12 Sep 2020 14:34:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8DiiDGjcXF/UFgAAbx9fmQ (envelope-from ) for ; Sat, 12 Sep 2020 14:34:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E720894053D for ; Sat, 12 Sep 2020 14:34:15 +0000 (UTC) Received: from localhost ([::1]:33526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6bW-0001FI-Sj for larch@yhetil.org; Sat, 12 Sep 2020 10:34:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH6bK-0000sj-Ml for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kH6bK-000693-DC for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kH6bK-0004Cz-Ah for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43354] [PATCH 47/55] gnu: python2-graphite-web: Update to 1.1.7. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Sep 2020 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43354@debbugs.gnu.org Received: via spool by 43354-submit@debbugs.gnu.org id=B43354.159992119416003 (code B ref 43354); Sat, 12 Sep 2020 14:34:02 +0000 Received: (at 43354) by debbugs.gnu.org; 12 Sep 2020 14:33:14 +0000 Received: from localhost ([127.0.0.1]:48762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6aX-0004A3-UW for submit@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6aW-00049X-GB for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:12 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36442) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6aR-0005s7-7I for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:07 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:53676 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kH6aO-00089M-VN for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:05 -0400 From: Marius Bakke Date: Sat, 12 Sep 2020 16:29:03 +0200 Message-Id: <20200912142911.6231-47-marius@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200912142911.6231-1-marius@gnu.org> References: <20200912142911.6231-1-marius@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: nm6mG4DzPBMb * gnu/packages/monitoring.scm (python2-graphite-web): Rename to ... (graphite-web): ... this. Update to 1.1.7. [arguments]: Add #:tests?. Adjust setup.py substitutions. [propagated-inputs]: Use the Python 3 versions of all inputs. [home-page]: Use HTTPS. --- gnu/packages/monitoring.scm | 38 +++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 16de32b306..8f4b7a945f 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -330,43 +330,45 @@ caching them in memory for \"hot queries\" from the Graphite-Web application, and persisting them to disk using the Whisper time-series library.") (license license:asl2.0))) -(define-public python2-graphite-web +(define-public graphite-web (package - (name "python2-graphite-web") - (version "1.0.2") + (name "graphite-web") + (version "1.1.7") (source (origin (method url-fetch) (uri (pypi-uri "graphite-web" version)) (sha256 (base32 - "0q8bwlj75jqyzmazfsi5sa26xl58ssa8wdxm2l4j0jqyn8xpfnmc")))) + "1l5a5rry9cakqxamvlx4xq63jifmncb6815bg9vy7fg1zyd3pjxk")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; only supports Python 2 + `(#:tests? #f ;XXX: not in PyPI release & requires database #:phases (modify-phases %standard-phases (add-after 'unpack 'relax-requirements (lambda _ (substitute* "setup.py" - (("0.4.3") ,(package-version python2-django-tagging)) - (("<1.9.99") (string-append "<=" - ,(package-version python2-django)))) + ;; Allow newer versions of django-tagging. + (("django-tagging==") + "django-tagging>=") + ;; Allow Django 3.1. + ((",<3\\.1") "")) #t)) ;; Don't install to /opt (add-after 'unpack 'do-not-install-to-/opt (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t))))) (propagated-inputs - `(("python2-cairocffi" ,python2-cairocffi) - ("python2-pytz" ,python2-pytz) - ("python2-whisper" ,python2-whisper) - ("python2-django" ,python2-django) - ("python2-django-tagging" ,python2-django-tagging) - ("python2-scandir" ,python2-scandir) - ("python2-urllib3" ,python2-urllib3) - ("python2-pyparsing" ,python2-pyparsing) - ("python2-txamqp" ,python2-txamqp))) - (home-page "http://graphiteapp.org/") + `(("python-cairocffi" ,python-cairocffi) + ("python-pytz" ,python-pytz) + ("python-whisper" ,python-whisper) + ("python-django" ,python-django) + ("python-django-tagging" ,python-django-tagging) + ("python-scandir" ,python-scandir) + ("python-urllib3" ,python-urllib3) + ("python-pyparsing" ,python-pyparsing) + ("python-txamqp" ,python-txamqp))) + (home-page "https://graphiteapp.org/") (synopsis "Scalable realtime graphing system") (description "Graphite is a scalable real-time graphing system that does two things: store numeric time-series data, and render graphs of this data on -- 2.28.0