From patchwork Sun Jan 21 20:07:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Delago X-Patchwork-Id: 59298 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 736EB27BBEC; Sun, 21 Jan 2024 20:12:22 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 1E35527BBE2 for ; Sun, 21 Jan 2024 20:12:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rReAk-0000kQ-Q6; Sun, 21 Jan 2024 15:12:02 -0500 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 1rReAj-0000kF-5N for guix-patches@gnu.org; Sun, 21 Jan 2024 15:12:01 -0500 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 1rReAi-0003Lk-Qe; Sun, 21 Jan 2024 15:12:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rReAj-0004SP-Lw; Sun, 21 Jan 2024 15:12:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68569] [PATCH v2 1/2] gnu: Add python-apprise. Resent-From: Mike Delago Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 20:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 68569@debbugs.gnu.org Cc: Mike Delago , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68569-submit@debbugs.gnu.org id=B68569.170586787317057 (code B ref 68569); Sun, 21 Jan 2024 20:12:01 +0000 Received: (at 68569) by debbugs.gnu.org; 21 Jan 2024 20:11:13 +0000 Received: from localhost ([127.0.0.1]:39065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRe9w-0004R2-E0 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 15:11:12 -0500 Received: from mail-yb1-xb2b.google.com ([2607:f8b0:4864:20::b2b]:57507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRe9u-0004Qo-91 for 68569@debbugs.gnu.org; Sun, 21 Jan 2024 15:11:10 -0500 Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-dc223463ee4so1892815276.2 for <68569@debbugs.gnu.org>; Sun, 21 Jan 2024 12:11:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705867860; x=1706472660; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tCpKewZGRvHOuFQVNzYKmqAknYh8eD/a/TZmV2PSAyQ=; b=kGR+S8hi+oAJgXy3KLop274iZMrHzA2HbGWIWqcb+oRRE6hU3pdKIzdlzLVf9aRhMA GXUFDodOYpZI4xB4H449XyfaLn1rpihvDMuSX709JkBagfqZqYzgilJXv2e9qSdWdidn +kpH8xJRFy7teb/oERcZB+J9t72iiRl3e1PaArz0NeW6KMHBJZsmCSJ9jJaDK8kHDxKE SXS5dZ3aDUth2sht2Trix3WgvqhAYjvLrRyT3R2BmpS0MvQPtdWdd1tRswrcvV4PB9Be 7KqS02t6rafkKRTfRCrQxPoo43JBSifVO2jMXiXWZ/Cz0PzwjFzhd01DxaGp+/QehOvr 8qQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705867860; x=1706472660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tCpKewZGRvHOuFQVNzYKmqAknYh8eD/a/TZmV2PSAyQ=; b=VdEVO2Hj96KqKO4kMX6JXAq2H9we+OaRmb9fcf0BrU4Qsz2xyCr3x23/nosPV16X1g MgtvMEW769vZnheF/BZMpH2wTyyylqvH8WMScyYAUrrlUcWTUTsjwTwnyHaDPyT9/06c Q80Re3SCREWeUAMOYm8u5Z7wilRoBJTfG2ZbNONuukhcefIcJgX08tK7WsqqXLCjTVmQ WkKkTva9a2AhHhJs75kzGyQcOIBStYYZCFhlE50Gy/ZUywKP2uuABTLv5FvZOmRnGnLE 4hd9gVBqpa5mlKzOKNKfE2IxsCEL0tqFbtgOXwTYzhmkBTa4U1K67dH2BJKsOqmeGF6C Ragg== X-Gm-Message-State: AOJu0Yx7Qo0wVAADplgvMRDEUJTuc7nC2RcR5uJlQXN+QivmiYGq0CbU z3x0+mirNlVxNngnLwrQP2NSkVfkxzuPJn3nhPNtsKhwM2ricqpJQ9LPrpnYckM= X-Google-Smtp-Source: AGHT+IGfZdLREGXp3vP7/XHBuCVavX8vJ8oDy6ssaUxYoXrB2DJDVqQ8yejL8iow8wy9Vm4ei/TpoA== X-Received: by 2002:a05:6902:4d0:b0:dc2:4afc:bad6 with SMTP id v16-20020a05690204d000b00dc24afcbad6mr1158942ybs.42.1705867860169; Sun, 21 Jan 2024 12:11:00 -0800 (PST) Received: from talos.griffin-scylla.ts.net ([2600:1700:1590:e930::46]) by smtp.gmail.com with ESMTPSA id d127-20020a256885000000b00dc228b22cd5sm1183857ybc.41.2024.01.21.12.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 12:10:59 -0800 (PST) From: Mike Delago Date: Sun, 21 Jan 2024 15:07:20 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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/python-xyz.scm (python-apprise): New variable. Change-Id: I24659780121e3d428002f504a459bea442790a7b --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aebbae1521..223d2e6f58 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14364,6 +14364,44 @@ (define-public python-appdirs should be stored on various operating systems.") (license license:expat))) +(define-public python-apprise + (package + (name "python-apprise") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "apprise" version)) + (sha256 + (base32 "0nkfv0pyn13lqdr3g3r1dhhnqxkjiayf9pny4m254w04al49shwd")) + ;; MacOS tests are failing when attempting to mock terminal-notifier calls. + ;; We don't need to test for MacOS support, and removing this file causes + ;; tests to succeed. + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "test/test_plugin_macosx.py"))))) + (build-system pyproject-build-system) + (native-inputs (list python-babel + python-coverage + python-flake8 + python-pytest + python-pytest-cov + python-pytest-mock + python-pytest-xdist)) + (propagated-inputs (list python-certifi + python-click + python-markdown + python-pyyaml + python-requests + python-requests-oauthlib)) + (home-page "https://github.com/caronc/apprise") + (synopsis "Push notification library and utility") + (description + "This module can send notifications to a large number of popular notification + services. This package also includes a command line tool for sending + notifications through the large number of supported services.") + (license license:bsd-2))) + (define-public python-google-pasta (package (name "python-google-pasta") From patchwork Sun Jan 21 20:07:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Delago X-Patchwork-Id: 59299 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 01C3C27BBE9; Sun, 21 Jan 2024 20:12:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 56A3D27BBEA for ; Sun, 21 Jan 2024 20:12:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rReAi-0000k3-FK; Sun, 21 Jan 2024 15:12:00 -0500 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 1rReAg-0000jq-Th for guix-patches@gnu.org; Sun, 21 Jan 2024 15:11:58 -0500 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 1rReAg-0003LN-LL for guix-patches@gnu.org; Sun, 21 Jan 2024 15:11:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rReAk-0004SW-6q for guix-patches@gnu.org; Sun, 21 Jan 2024 15:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68569] [PATCH v2 2/2] gnu: borgmatic: Update to 1.8.6. Resent-From: Mike Delago Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 68569@debbugs.gnu.org Cc: Mike Delago Received: via spool by 68569-submit@debbugs.gnu.org id=B68569.170586788817088 (code B ref 68569); Sun, 21 Jan 2024 20:12:02 +0000 Received: (at 68569) by debbugs.gnu.org; 21 Jan 2024 20:11:28 +0000 Received: from localhost ([127.0.0.1]:39068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rReAB-0004RX-Vf for submit@debbugs.gnu.org; Sun, 21 Jan 2024 15:11:28 -0500 Received: from mail-yw1-x112a.google.com ([2607:f8b0:4864:20::112a]:55781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rReA9-0004RG-8x for 68569@debbugs.gnu.org; Sun, 21 Jan 2024 15:11:25 -0500 Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-5f3da7ba2bfso20174337b3.3 for <68569@debbugs.gnu.org>; Sun, 21 Jan 2024 12:11:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705867875; x=1706472675; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ViNj43hietEQEQC7DQIeIzcSoE3SX19pr6gZWFQW1kQ=; b=BFPHwhPNLDY/LA2OFZ/W8zKEb2p1yRSeTkNwr2EQaPJQP3IKNSGUiLjHw+R0T+bgaU y/4BsZinSQGCOos6k7F9SAik9SdRsEIAHkLcWYBhk5aMx78Qp0jQOC1IgP4lBlgk4ZET XnTPxFBeDkkf2q7+cCS9W3p3A44/ficsKqMJ32NQY8P16fJGh7Hu94x/GvVLx/hO57gc FY6XCd8BV90K3x0NT4YgWNi2FPCgype8zctB4940jQinz0USqBVogVxlmGbCvgFpBmTs iSnQsGhfKQ1D+LJBfEO55raCIfLnVLonH8oGdtFg7uzmXnvPKDWEhpDY8D5B9wK3OPbW J87w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705867875; x=1706472675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ViNj43hietEQEQC7DQIeIzcSoE3SX19pr6gZWFQW1kQ=; b=FUyH93tm4HOc/jM5hbTeyNlwOIRECZ1Pva8x4QtAwuPCOoBxqYoKFxGDMCFiwg7L8n 9LyrtmUUKp/unLKLtCRoth9cABBotkG2ZSsqSuLFL2ZG0AUYA+FgrtRzOGdbKb2hz5Mc q5FlGbFHmakizZb/DQj+pu0madDauk8n0IcqCN1eBAG3G4aV5sJteWh9HtBQ7uFgMWj4 yX2toka+Ci+Dp+g+vxP7gZsPgeo5lDNpHaVKHvNK2NNu+ExgRNyLFgLq/D4TMz/ym8NC g9i33HE/8C++7iyjI8vbEmqqm4Fj5Mi6LaZFkcm7t1dyAw05ug0iyvnASLO80SG5F1BJ jFYQ== X-Gm-Message-State: AOJu0YwJwZ7gbbeogKpw2kSwOj6XYZSndTARxWfoTFPhRtfgDm9bmMnQ esyRqjRcUoE3H4HXLzQeb4M5BJEynr0Cvlik7t0x7wWm3l2FvFNM1c0SOuzizsM= X-Google-Smtp-Source: AGHT+IFFhp0ZzTgLXFrxhr9X8vCcAaJlytroVebQWYMh9MqXK5ujZTzv7wxaGkE5rqpIugpTAY3AaQ== X-Received: by 2002:a0d:f447:0:b0:5ff:9b2a:d0b9 with SMTP id d68-20020a0df447000000b005ff9b2ad0b9mr2247088ywf.97.1705867875107; Sun, 21 Jan 2024 12:11:15 -0800 (PST) Received: from talos.griffin-scylla.ts.net ([2600:1700:1590:e930::46]) by smtp.gmail.com with ESMTPSA id d127-20020a256885000000b00dc228b22cd5sm1183857ybc.41.2024.01.21.12.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 12:11:14 -0800 (PST) From: Mike Delago Date: Sun, 21 Jan 2024 15:07:21 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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/backup.scm (borgmatic): Update to 1.8.6. [inputs]: Add python-apprise. Change-Id: I4daed9554eec0117cecccc74325cc1b4b75aa7b2 --- gnu/packages/backup.scm | 61 +++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..c2482f0792 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1304,42 +1304,45 @@ (define-public disarchive (define-public borgmatic (package (name "borgmatic") - (version "1.7.12") + (version "1.8.6") (source (origin (method url-fetch) (uri (pypi-uri "borgmatic" version)) (sha256 - (base32 "0720wvs3h2w8h28d7mpvjfp0q37dnrwf1y2ik3y4yr9csih7fmgh")))) + (base32 "14bngfhfzlrqjhqw059gr6mggz84nr97b3y7y8nj53431jwrfpas")))) (build-system python-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs #:allow-other-keys) - ;; Set absolute store path to borg. - (substitute* "borgmatic/commands/borgmatic.py" - (("\\.get\\('local_path', 'borg'\\)") - (string-append ".get('local_path', '" - (search-input-file inputs "bin/borg") - "')"))) - (substitute* "tests/unit/commands/test_borgmatic.py" - (("(module.get_local_path.+ == )'borg'" all start) - (string-append start "'" - (search-input-file inputs "bin/borg") - "'"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Tests require the installed executable. - (setenv "PATH" (string-append #$output "/bin" - ":" (getenv "PATH"))) - (invoke "pytest"))))))) - (inputs - (list borg python-colorama python-jsonschema python-requests - python-ruamel.yaml)) - (native-inputs - (list python-flexmock python-pytest python-pytest-cov)) + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Set absolute store path to borg. + (substitute* "borgmatic/commands/borgmatic.py" + (("\\.get\\('local_path', 'borg'\\)") + (string-append ".get('local_path', '" + (search-input-file inputs "bin/borg") + "')"))) + (substitute* "tests/unit/commands/test_borgmatic.py" + (("(module.get_local_path.+ == )'borg'" all start) + (string-append start "'" + (search-input-file inputs "bin/borg") + "'"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Tests require the installed executable. + (setenv "PATH" + (string-append #$output "/bin" ":" + (getenv "PATH"))) + (invoke "pytest"))))))) + (inputs (list borg + python-apprise + python-colorama + python-jsonschema + python-requests + python-ruamel.yaml)) + (native-inputs (list python-flexmock python-pytest python-pytest-cov)) (home-page "https://torsion.org/borgmatic/") (synopsis "Simple, configuration-driven backup software") (description