GNU bug report logs - #73038
[PATCH 0/2] Update borgmatic to 1.8.14

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73038 in the body.
You can then email your comments to 73038 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Your Name <steve <at> futurile.net>
To: guix-patches <at> gnu.org
Cc: Your Name <steve <at> futurile.net>
Subject: [PATCH 0/2] Update borgmatic to 1.8.14
Date: Thu,  5 Sep 2024 14:00:10 +0100

Series to update borgmatic to 1.8.14

Steve George (2):
  gnu: python-apprise: Fix build.
  gnu: borgmatic: Update to 1.8.14.

 gnu/packages/backup.scm     |  4 ++--
 gnu/packages/python-xyz.scm | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)


base-commit: f42427046b11029faaa69b7f10c77b45240e1111
-- 
2.45.2

Message #8 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>
Subject: [PATCH 2/2] gnu: borgmatic: Update to 1.8.14.
Date: Thu,  5 Sep 2024 15:36:30 +0100

* gnu/packages/backup.scm (borgmatic): Update to 1.8.14.

Change-Id: Ib3af35971d1f8822562bbce2f191f292eb9badfe
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 155e90e34e..b5ebafb254 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1308,13 +1308,13 @@ (define-public disarchive
 (define-public borgmatic
   (package
     (name "borgmatic")
-    (version "1.8.13")
+    (version "1.8.14")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgmatic" version))
        (sha256
-        (base32 "08vlknlhczi98kwcrkaqvrwfxm9v284b4iaagrwgfzk32fdn57p1"))))
+        (base32 "0im7kx9mq1gymid88wa6yxcif4bdqpz5lag5fp9kpm8r5k13p2sr"))))
     (build-system python-build-system)
     (arguments
      (list
-- 
2.45.2

Message #14 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Your Name <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Your Name <steve <at> futurile.net>
Subject: [PATCH 1/2] gnu: python-apprise: Fix build.
Date: Thu,  5 Sep 2024 15:16:59 +0100

* gnu/packages/python-xyz.scm (python-apprise): fix build failures
    [native-inputs]: Remove unused python-flake8
    [arguments]: turn off mqltt_tls tests that fail

Change-Id: Ia1a5b3d6ff284dc57f083c4bdbd1f6356be7a700
---
 gnu/packages/python-xyz.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 650220b71c..87c27beb55 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -324,7 +324,6 @@ (define-public python-apprise
     (native-inputs (list python-babel
                          python-coverage
                          python-cryptography
-                         python-flake8
                          python-paho-mqtt
                          python-pytest
                          python-pytest-cov
@@ -333,12 +332,16 @@ (define-public python-apprise
                          python-wheel))
     (arguments
      (list
-      #:phases #~(modify-phases %standard-phases
-                   (replace 'check
-                     (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-                       (when tests?
-                         (delete-file "test/test_plugin_macosx.py")
-                         (invoke "pytest")))))))
+      #:phases
+        #~(modify-phases %standard-phases
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (delete-file "test/test_plugin_macosx.py")
+                  (invoke "pytest" "-vv" "-k"
+                          (string-append
+                           "not test_plugin_mqtt_tls_connect_success"
+                           " and not test_plugin_mqtt_tls_no_verify_success"))))))))
     (home-page "https://github.com/caronc/apprise")
     (synopsis
      "Push notification Python library that works with many platforms")

base-commit: f42427046b11029faaa69b7f10c77b45240e1111
-- 
2.45.2

Message #17 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Your Name <steve <at> futurile.net>
Subject: [PATCH 1/2] gnu: python-apprise: Fix build.
Date: Thu,  5 Sep 2024 15:57:50 +0100

From: Your Name <steve <at> futurile.net>

* gnu/packages/python-xyz.scm (python-apprise): fix build failures
    [native-inputs]: Remove unused python-flake8
    [arguments]: turn off mqltt_tls tests that fail

Change-Id: Ia1a5b3d6ff284dc57f083c4bdbd1f6356be7a700
---
 gnu/packages/python-xyz.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 650220b71c..87c27beb55 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -324,7 +324,6 @@ (define-public python-apprise
     (native-inputs (list python-babel
                          python-coverage
                          python-cryptography
-                         python-flake8
                          python-paho-mqtt
                          python-pytest
                          python-pytest-cov
@@ -333,12 +332,16 @@ (define-public python-apprise
                          python-wheel))
     (arguments
      (list
-      #:phases #~(modify-phases %standard-phases
-                   (replace 'check
-                     (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-                       (when tests?
-                         (delete-file "test/test_plugin_macosx.py")
-                         (invoke "pytest")))))))
+      #:phases
+        #~(modify-phases %standard-phases
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (delete-file "test/test_plugin_macosx.py")
+                  (invoke "pytest" "-vv" "-k"
+                          (string-append
+                           "not test_plugin_mqtt_tls_connect_success"
+                           " and not test_plugin_mqtt_tls_no_verify_success"))))))))
     (home-page "https://github.com/caronc/apprise")
     (synopsis
      "Push notification Python library that works with many platforms")

base-commit: f42427046b11029faaa69b7f10c77b45240e1111
-- 
2.45.2

Message #29 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>
Subject: [PATCH v2 0/2] Series to update borgmatic to 1.8.14
Date: Sat,  7 Sep 2024 09:32:40 +0100

- Re-roll so QA can pick it up correctly

Steve George (2):
  gnu: python-apprise: Fix build.
  gnu: borgmatic: Update to 1.8.14.

 gnu/packages/backup.scm     |  4 ++--
 gnu/packages/python-xyz.scm | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)


base-commit: f42427046b11029faaa69b7f10c77b45240e1111
-- 
2.45.2

Message #32 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>
Subject: [PATCH v2 1/2] gnu: python-apprise: Fix build.
Date: Sat,  7 Sep 2024 09:32:41 +0100

* gnu/packages/python-xyz.scm (python-apprise): fix build failures
    [native-inputs]: Remove unused python-flake8
    [arguments]: turn off mqltt_tls tests that fail

Change-Id: Ia1a5b3d6ff284dc57f083c4bdbd1f6356be7a700
---
 gnu/packages/python-xyz.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 650220b71c..87c27beb55 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -324,7 +324,6 @@ (define-public python-apprise
     (native-inputs (list python-babel
                          python-coverage
                          python-cryptography
-                         python-flake8
                          python-paho-mqtt
                          python-pytest
                          python-pytest-cov
@@ -333,12 +332,16 @@ (define-public python-apprise
                          python-wheel))
     (arguments
      (list
-      #:phases #~(modify-phases %standard-phases
-                   (replace 'check
-                     (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-                       (when tests?
-                         (delete-file "test/test_plugin_macosx.py")
-                         (invoke "pytest")))))))
+      #:phases
+        #~(modify-phases %standard-phases
+            (replace 'check
+              (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                (when tests?
+                  (delete-file "test/test_plugin_macosx.py")
+                  (invoke "pytest" "-vv" "-k"
+                          (string-append
+                           "not test_plugin_mqtt_tls_connect_success"
+                           " and not test_plugin_mqtt_tls_no_verify_success"))))))))
     (home-page "https://github.com/caronc/apprise")
     (synopsis
      "Push notification Python library that works with many platforms")
-- 
2.45.2

Message #35 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: 73038 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>
Subject: [PATCH v2 2/2] gnu: borgmatic: Update to 1.8.14.
Date: Sat,  7 Sep 2024 09:32:42 +0100

* gnu/packages/backup.scm (borgmatic): Update to 1.8.14.

Change-Id: I96d24d305d34fbd2555c009cb694c274eaf64844
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 155e90e34e..b5ebafb254 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1308,13 +1308,13 @@ (define-public disarchive
 (define-public borgmatic
   (package
     (name "borgmatic")
-    (version "1.8.13")
+    (version "1.8.14")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgmatic" version))
        (sha256
-        (base32 "08vlknlhczi98kwcrkaqvrwfxm9v284b4iaagrwgfzk32fdn57p1"))))
+        (base32 "0im7kx9mq1gymid88wa6yxcif4bdqpz5lag5fp9kpm8r5k13p2sr"))))
     (build-system python-build-system)
     (arguments
      (list
-- 
2.45.2

Message #38 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 73038 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>
Subject: Re: [PATCH 0/2] Update borgmatic to 1.8.14
Date: Sat, 07 Sep 2024 14:30:45 -0500

hi,

it looks like the patch does not apply.

can you send a v3 after rebasing?

$ mumi am v2 -- -s -S
Applying: gnu: python-apprise: Fix build.
Applying: gnu: python-apprise: Fix build.
error: patch failed: gnu/packages/python-xyz.scm:324
error: gnu/packages/python-xyz.scm: patch does not apply
Patch failed at 0001 gnu: python-apprise: Fix build.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Backtrace:
           2 (primitive-load "/gnu/store/bj3yzpfpmxxwxl02gr7lby212c5…")
In srfi/srfi-1.scm:
    634:9  1 (for-each #<procedure 7f1ae6cc31e0 at mumi/client.scm:…> …)
In mumi/client.scm:
   249:12  0 (call-with-output-pipe* _ _ . _)

mumi/client.scm:249:12: In procedure call-with-output-pipe*:
Command invocation failed failed ("git" "am" "-s" "-S")

-- 
mumi the world,
jgart

Message #41 received at 73038 <at> debbugs.gnu.org (full text, mbox):

From: Steve George <steve <at> futurile.net>
To: jgart <jgart <at> dismail.de>
Cc: 73038 <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Update borgmatic to 1.8.14
Date: Mon, 9 Sep 2024 13:15:46 +0100

Hi,

I've confused Mumi somehow, it's not that the patch is malformed. This works for applying:

## apply v2 by downloading it from Debbugs as Mumi gets confused
guix shell --development guix mumi git git:send-email wget

  # base commit for v2 series from cover-letter
  git branch borgmatic-v2-tst5-apply f42427046b11029faaa69b7f10c77b45240e1111
  git switch borgmatic-v2-tst5-apply

  # Dezyne commit from Janneke
  git log

  wget "https://debbugs.gnu.org/cgi/bugreport.cgi?mbox=yes;msg=32;bug=73038" -O python-apprise-v2.mbx
  wget "https://debbugs.gnu.org/cgi/bugreport.cgi?mbox=yes;msg=35;bug=73038" -O borgmatic-1.8.14-v2.mbx

  git am -s python-apprise-v2.mbx
  git am borgmatic-1.8.14-v2.mbx

I seem to keep getting the python apprise patch when I try and download the borgmatic patch v2 patch from Guix Issues:

    wget "https://issues.guix.gnu.org/issue/73038/raw/6

Which maybe why the Mumi cli tool gets confused because it's processing the same patch twice.

Pretty sure I messed it up by accidently sending the first patch with the incorrect email details and I've just confused th heck out of everything. Anyway, the above works to get the v2 patches and apply them.

Thanks,

Steve


On  7 Sep, jgart wrote:
> 
> hi,
> 
> it looks like the patch does not apply.
> 
> can you send a v3 after rebasing?
> 
> $ mumi am v2 -- -s -S
> Applying: gnu: python-apprise: Fix build.
> Applying: gnu: python-apprise: Fix build.
> error: patch failed: gnu/packages/python-xyz.scm:324
> error: gnu/packages/python-xyz.scm: patch does not apply
> Patch failed at 0001 gnu: python-apprise: Fix build.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config advice.mergeConflict false"
> Backtrace:
>            2 (primitive-load "/gnu/store/bj3yzpfpmxxwxl02gr7lby212c5…")
> In srfi/srfi-1.scm:
>     634:9  1 (for-each #<procedure 7f1ae6cc31e0 at mumi/client.scm:…> …)
> In mumi/client.scm:
>    249:12  0 (call-with-output-pipe* _ _ . _)
> 
> mumi/client.scm:249:12: In procedure call-with-output-pipe*:
> Command invocation failed failed ("git" "am" "-s" "-S")
> 
> -- 
> mumi the world,
> jgart

Message #46 received at 73038-done <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 73038-done <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Steve George <steve <at> futurile.net>
Subject: Re: [PATCH 0/2] Update borgmatic to 1.8.14
Date: Mon, 09 Sep 2024 23:48:33 -0500

Applied, thanks!

-- 
all the best,
jgart

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.