From patchwork Thu Jan 18 14:32:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Delago X-Patchwork-Id: 59097 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 9AC7727BBE9; Thu, 18 Jan 2024 14:33:27 +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=unavailable 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 6032D27BBE2 for ; Thu, 18 Jan 2024 14:33:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTS3-0000Bv-8a; Thu, 18 Jan 2024 09:33:03 -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 1rQTS0-0000AD-OJ for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33:00 -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 1rQTS0-0002Hu-Fy for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQTS2-00071E-0d for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68569] [PATCH 1/2] gnu: Add python-apprise. Resent-From: Mike Delago Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 14:33: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 To: 68569@debbugs.gnu.org Cc: Mike Delago Received: via spool by 68569-submit@debbugs.gnu.org id=B68569.170558835626937 (code B ref 68569); Thu, 18 Jan 2024 14:33:01 +0000 Received: (at 68569) by debbugs.gnu.org; 18 Jan 2024 14:32:36 +0000 Received: from localhost ([127.0.0.1]:54606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQTRY-00070K-6A for submit@debbugs.gnu.org; Thu, 18 Jan 2024 09:32:36 -0500 Received: from mail-oo1-xc2e.google.com ([2607:f8b0:4864:20::c2e]:47478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQTRU-0006zy-NG for 68569@debbugs.gnu.org; Thu, 18 Jan 2024 09:32:30 -0500 Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-59927972125so1087434eaf.3 for <68569@debbugs.gnu.org>; Thu, 18 Jan 2024 06:32:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588341; x=1706193141; 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=mH6npZZDpba5kD0GTuSJkKUNN0//uBZuMfzNcNsVO9o=; b=a/xmYZWsduNWdQHqsapeC/+yHzz3w1ZANYSKVsdRgHisnNyEwORa1N0wpJf+3yKjQc KmVt9rzEjqS2hhKCtIXzwrBWCwnSh8gYNM7W1H8X5/1aetpFcjPaoHjInbXEiSMwl3t0 ba022TWQdLi/0RnH5QY3m7HerlNY2VuTiH3vjVSn247ZOspwaWbKoVWuTiwpv4/07Mhb oZEraEqjWdb1Iwt7jhrL1z/FILxUOTAC0iY96M7gwcGcEqsEmWknPmInU9qvX3Aaj1iA Tzvt0O+iPjjmkj4317yRgPJGfI+hzoFrcutxC/cxsMW1pbCF4ag9MC7TVWCcA9L/Icdv B//w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588341; x=1706193141; 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=mH6npZZDpba5kD0GTuSJkKUNN0//uBZuMfzNcNsVO9o=; b=OiUvaSDOKwAF24UfEmQ8022dwoXBcUPGf1Ol2OEEM8st5Ub1qkvV4kWGPxeG3cPLBf pYarqCVmOSQ8W/Xd0cIBRB2nF+NmMu+8hkIzFGuUVjOiCSGkw+tbbKsNyElRg+hdJs2f lFUy4Vc6xvv5mVnAFjmv5xq+s0DhJcF1gxvNKGcmCnVs9nQlWsJy9LZPRoa3LwWtmph8 iLw7MVHOipfsPr0/68nhY9Pz2strQ9rqGHD+Am3xSGxu0RHcrC1QOcK65K3t5LkZMshw 2uzdSUJ/1pn9X4r6Sk2yaMX5pCqbOft4No68OqW/fvi+qvw+20JYygltwWGJme9Vbvpw 4XRg== X-Gm-Message-State: AOJu0Yx1G+t+Eo5IFVEkmGV9n90TGgxSY4ieR9frgWJkW7toAUj9vv+q Ib010+eWvBlZOQJ5a0tOZEFPSaQQDfMZafEgXZuddJzMChJW/gsA7V/ivkGbA1c= X-Google-Smtp-Source: AGHT+IGkX5a1CgZbRvxJsApdm3oTHof8JX04ZMzfag4lqXdRbG5sf2dAUGNHGaHKGxTt0Uf7tvWIoQ== X-Received: by 2002:a05:6359:6107:b0:175:c37d:2a47 with SMTP id rz7-20020a056359610700b00175c37d2a47mr846827rwb.35.1705588340660; Thu, 18 Jan 2024 06:32:20 -0800 (PST) Received: from talos.attlocal.net ([2600:1700:1590:e930::46]) by smtp.gmail.com with ESMTPSA id cd10-20020a05690c088a00b005fb56881fa9sm6503832ywb.15.2024.01.18.06.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:32:20 -0800 (PST) From: Mike Delago Date: Thu, 18 Jan 2024 09:32:07 -0500 Message-ID: <236d62db2eb224c0ae8ee7ea0fabecbb4dc4c929.1705586561.git.michaeldelago98@gmail.com> 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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aebbae1521..aecebb1dde 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14364,6 +14364,42 @@ (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) + (propagated-inputs (list python-certifi + python-click + python-markdown + python-pyyaml + python-requests + python-requests-oauthlib)) + (native-inputs (list python-babel + python-coverage + python-flake8 + python-pytest + python-pytest-cov + python-pytest-mock + python-pytest-xdist)) + (home-page "https://github.com/caronc/apprise") + (synopsis "Push Notifications that work with just about every platform!") + (description + "Push Notifications that work with just about every platform!") + (license license:bsd-3))) + (define-public python-google-pasta (package (name "python-google-pasta") From patchwork Thu Jan 18 14:32:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Delago X-Patchwork-Id: 59096 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 3596127BBE2; Thu, 18 Jan 2024 14:33:15 +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=unavailable 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 92AE327BBE9 for ; Thu, 18 Jan 2024 14:33:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTS1-0000BZ-Tr; Thu, 18 Jan 2024 09:33:01 -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 1rQTS1-0000Au-5T for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33: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 1rQTS0-0002I0-TB for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQTS2-00071M-HV for guix-patches@gnu.org; Thu, 18 Jan 2024 09:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68569] [PATCH 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: Thu, 18 Jan 2024 14:33: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 To: 68569@debbugs.gnu.org Cc: Mike Delago Received: via spool by 68569-submit@debbugs.gnu.org id=B68569.170558836026952 (code B ref 68569); Thu, 18 Jan 2024 14:33:02 +0000 Received: (at 68569) by debbugs.gnu.org; 18 Jan 2024 14:32:40 +0000 Received: from localhost ([127.0.0.1]:54609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQTRe-00070d-7T for submit@debbugs.gnu.org; Thu, 18 Jan 2024 09:32:39 -0500 Received: from mail-yw1-x1134.google.com ([2607:f8b0:4864:20::1134]:53672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQTRb-00070H-TJ for 68569@debbugs.gnu.org; Thu, 18 Jan 2024 09:32:37 -0500 Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-5f0629e67f4so123461927b3.3 for <68569@debbugs.gnu.org>; Thu, 18 Jan 2024 06:32:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588348; x=1706193148; 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=tyvC6p+hGIUEgFhPOVYDuT8VFJQF+sbwYBf2Y/PgNc4=; b=MO7SHbdvjNTWd2UI75dysTky1zUdFPJHtQV2gp8IwEHtLB7M4Hcq2CzSRaJrTi3DIa IaJJ4kAru3rNHD0OVPgDOeWkePRMo/kY+qTFRYUTYU9DaSyYYLb9srQXstzqvzmNIfOi Vbg823W69KpisZAM4nJcqqR24ttx9x7sbBMh7lmZ8hzJWqC5FdIlFo4ESTKXWYsgW3lh 8F8LlQjTuvOTeYLgBm+nFLlsw6+nY9jaehaw8NIUR70kquViV91in6iEgsLNifka2KvU VwVByPKkOjsSE5ZZCTaqRSFTDFnsoGz5x+p//6bFJWWpItLFrehvEbN5sLNI2tqfBNo5 wjiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588348; x=1706193148; 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=tyvC6p+hGIUEgFhPOVYDuT8VFJQF+sbwYBf2Y/PgNc4=; b=r3lxIWFOW0c+UgACMjquAsKqfH1xJWy9aJoRzGkNAKP1OFiN/v47UxHyRwewL2+JWp wWHMQigurJYAERyj/K4zjZoYpStITnVi/IPuMSf0e1LSUQzmQd826RIG9tgT5Ccx0k/5 03psZ41WgLLaX+1++XbFMqHmXbKkBj270DiHMmgQYvJkNb18C3e4E9ESvdqGPEgZHS+s QJoTUHPZzJ4MyZoH7uMrhRWFUm2JlfQ/9de8m/ZCFCT2MYoJY+budLwql5UV+RsMY/Sn 28o0kdAvNiGF6kWR3AD7R4ltOLGiDL/htNcuzOAm2qs07izlkXmnFhCPqe/h6+oUF5vi Ts/w== X-Gm-Message-State: AOJu0YyXwr39WCBvGkIzIC8wPCx+R1hZP+nZXmf5CQYfTB4xjCNzAxWV oOuM3Gw41OeRp7P6PJ12hQ+Qq9pijb3yR48mrXxk4duRAgy14IOvDf/i5DXocZo= X-Google-Smtp-Source: AGHT+IE+R9Iy0GAzTltSbBGZlA3/IgecNXmlRTWNCSv3lZl4Y22Or0hpY5Izrw2PQmRjZkoEEGPmLQ== X-Received: by 2002:a81:4f8f:0:b0:5f8:1f59:fd02 with SMTP id d137-20020a814f8f000000b005f81f59fd02mr760111ywb.13.1705588348269; Thu, 18 Jan 2024 06:32:28 -0800 (PST) Received: from talos.attlocal.net ([2600:1700:1590:e930::46]) by smtp.gmail.com with ESMTPSA id cd10-20020a05690c088a00b005fb56881fa9sm6503832ywb.15.2024.01.18.06.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:32:28 -0800 (PST) From: Mike Delago Date: Thu, 18 Jan 2024 09:32:08 -0500 Message-ID: <1246f706b66ff104a3792f29fdb9fd99c1d5a9b8.1705586561.git.michaeldelago98@gmail.com> 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..2c9bc4034d 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-colorama + python-jsonschema + python-requests + python-ruamel.yaml + python-apprise)) + (native-inputs (list python-flexmock python-pytest python-pytest-cov)) (home-page "https://torsion.org/borgmatic/") (synopsis "Simple, configuration-driven backup software") (description