From patchwork Mon Mar 10 02:16:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 40039 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 A0A7E27BBEB; Mon, 10 Mar 2025 02:19:56 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham 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 A9B7027BBE2 for ; Mon, 10 Mar 2025 02:19:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trSi4-0001kQ-5O; Sun, 09 Mar 2025 22:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trShh-0001fi-MH for guix-patches@gnu.org; Sun, 09 Mar 2025 22:17:22 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trShg-0007hu-4K for guix-patches@gnu.org; Sun, 09 Mar 2025 22:17:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=g4QVj1INg+8sLxsWuWBB5nJMddPm5VfBS6Z40M2svLk=; b=vwNZK+uw4FpT4JJzXIYYakKnUhXoFXIf8JvmFqFOt426rie6Li6CzSL/1eFXGjbNIwmfr8m4TC8UNYbv111mWPSELXKwdY976AOELEWbW4IKd3P18m1CElj/yNF90qyfCRvGWChmzV408Pg4gOq5NK1ggV4kEZ/tWRaACv1m65tsS9TyW2T7k6AeZ73KGW804jUSPEAiMgZeoXDEoqHb5X5sKBqhhFHw8h2OonsH0eYLu+iOa7LEZbKaclcRu7eaivzvaOruZ2UVm1GNY1psp2Z5/vQxGBn6nuAdjWwEe9M/Y+wu8B1eFKub0z7XH6gGBcyzC4Xmq0NDCKI3w64adw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1trShf-0001CA-UR for guix-patches@gnu.org; Sun, 09 Mar 2025 22:17:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76835] [PATCH v3 06/40] gnu: graphite-web: Update to 1.1.10-2.49c28e2. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Mar 2025 02:17:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76835@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76835-submit@debbugs.gnu.org id=B76835.17415730314502 (code B ref 76835); Mon, 10 Mar 2025 02:17:15 +0000 Received: (at 76835) by debbugs.gnu.org; 10 Mar 2025 02:17:11 +0000 Received: from localhost ([127.0.0.1]:35356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1trSha-0001AO-6S for submit@debbugs.gnu.org; Sun, 09 Mar 2025 22:17:10 -0400 Received: from 20.mo583.mail-out.ovh.net ([91.121.55.239]:37795) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1trShR-000164-Eg for 76835@debbugs.gnu.org; Sun, 09 Mar 2025 22:17:04 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.140.34]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4ZB0rq4kfXz1RPG for <76835@debbugs.gnu.org>; Mon, 10 Mar 2025 02:16:59 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-pzhbq (unknown [10.110.118.186]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 577CC1FD37; Mon, 10 Mar 2025 02:16:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-pzhbq with ESMTPSA id pjD4A5tLzmcwNRoAyzgd5g (envelope-from ); Mon, 10 Mar 2025 02:16:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0031f21efeb-ad8a-424b-ace6-17bf4b5ffaa7, 031A57722FDA369A3035EBF391DEEA525A5E801E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 10 Mar 2025 03:16:11 +0100 Message-ID: <20250310021652.17530-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310021652.17530-1-ngraves@ngraves.fr> References: <20250310021652.17530-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 5447948176469517026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudekuddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdegffefuddutdeuiedujeeiveefjefhjeeugeevudduleffjeeiueehtdelveejnecuffhomhgrihhnpehgrhgrphhhihhtvggrphhprdhorhhgpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeeikeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=g4QVj1INg+8sLxsWuWBB5nJMddPm5VfBS6Z40M2svLk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741573019; v=1; b=vz7Y3bSGMFQGEM7dwRvOgU4xJfxw/ZTBIZo7bFceuSC7HmxEOs+bdIDSoej09oYmi4W/RmuU 2EgOVyJ7bMpe1MHmb+YmiaaXWoSAbD5c1TVv2nyrN0XpugIorxN+Dm4otpHWBRH31Acz5Hf/lSl E5c2f3SzQ4fCvWcEqkp3BxuJSZZ0tLW0X3ES6z9yCmVb3+C3Y8ACDfUkreG9ij8VkfiDdamG0Li wZrprzZ+wyxQaqsoiIXoGx+5OOe5t5BIMSBsxIMyEIdjkRMaqm5xv396MtjmWpjqUK7yzWpKN0c Bh02gz8uBIl/UbPvwMcVfsF5xbn/02fYH4n58VgbSwBOQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/monitoring.scm (graphite-web): Update to 1.1.10-2.49c28e2. --- gnu/packages/monitoring.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index b75500fc08..1009c32783 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -69,6 +69,7 @@ (define-module (gnu packages monitoring) #:use-module (gnu packages prometheus) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rrdtool) @@ -461,45 +462,69 @@ (define-public python-carbon (license license:asl2.0))) (define-public graphite-web - (package - (name "graphite-web") - (version "1.1.10") - (source - (origin - (method url-fetch) - (uri (pypi-uri "graphite-web" version)) - (sha256 - (base32 - "0nnk3kwn0b6bq9xnmv9bac6hpcbdgpgwf283c1ck5nm80panh61z")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ;XXX: not in PyPI release & requires database - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "setup.py" - ;; Allow newer versions of django-tagging. - (("django-tagging==") "django-tagging>=") - ;; And Django. - (("Django>=1\\.8,<3\\.1") "Django>=1.8,<4")))) - ;; Don't install to /opt - (add-after 'unpack 'do-not-install-to-/opt - (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t))))) - (propagated-inputs - (list python-cairocffi - python-django-3.2 - python-django-tagging - python-pyparsing - python-pytz - python-six - python-urllib3)) - (home-page "https://graphiteapp.org/") - (synopsis "Scalable realtime graphing system") - (description "Graphite is a scalable real-time graphing system that does + (let ((commit "49c28e2015d605ad9ec93524f7076dd924a4731a") + (revision "2")) + (package + (name "graphite-web") + (version (git-version "1.1.10" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/graphite-project/graphite-web") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bcc6jh7gyp8f54dzy4zza1z46gk3530r952pi86irf834z106sg")))) + (build-system pyproject-build-system) + (arguments + `(#:tests? #f ;XXX: Requires database, unable to run now + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ;; Allow newer versions of django-tagging. + (("django-tagging==") "django-tagging>=") + ;; And Django. + (("Django>=3\\.2,<4") "Django>=4,<5")))) + ;; Don't install to /opt + (add-after 'unpack 'do-not-install-to-/opt + (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (mkdir-p "storage/log/webapp") + (with-directory-excursion "webapp" + (invoke "./manage.py" "test" "--pythonpath=." "tests" + "-k" (string-join + (list + "not test_dashboard_save_temporary_xss_key" + "test_dashboard_save_temporary_xss_name") + " and not "))))))))) + (native-inputs + (list python-carbon + python-mock + python-pytest + python-rrdtool + python-setuptools + python-tzdata + python-wheel + python-whisper)) + (propagated-inputs + (list python-cairocffi + python-django-4.2 + python-django-tagging + python-pyparsing + python-pytz + python-six + python-urllib3)) + (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 demand.") - (license license:asl2.0))) + (license license:asl2.0)))) (define-public python-prometheus-client (package