GNU bug report logs - #71806
[PATCH python-team] gnu: python-requests-toolbelt: Update to 1.0.0.

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 71806 in the body.
You can then email your comments to 71806 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: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH python-team] gnu: python-requests-toolbelt: Update to 1.0.0.
Date: Thu, 27 Jun 2024 16:20:11 +0000

* gnu/packages/python-web.scm (python-requests-toolbelt): Update to 1.0.0.
[arguments]: Delete tests that are incompatible with urllib3 >= 2.0.
[native-inputs]: Remove python-mock; add python-pyopenssl and python-trustme.

Change-Id: I349bd9cef34cdbf7a51612e8b9d5dac59101d1bd
---
 gnu/packages/python-web.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e8ead0ef12..0c0c433c5d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
 ;;; Copyright © 2021 Alice Brenon <alice.brenon <at> ens-lyon.fr>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
-;;; Copyright © 2022, 2023 Felix Gruber <felgru <at> posteo.net>
+;;; Copyright © 2022–2024 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2022 Peter Polidoro <peter <at> polidoro.io>
 ;;; Copyright © 2022 Antero Mejr <antero <at> mailbox.org>
 ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701 <at> gmail.com>
@@ -3761,13 +3761,13 @@ (define-public python-requests-mock
 (define-public python-requests-toolbelt
   (package
     (name "python-requests-toolbelt")
-    (version "0.9.1")
+    (version "1.0.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests-toolbelt" version))
              (sha256
               (base32
-               "1h3gm88dcjbd7gm229a7x5qkkhnsqsjz0m0l2xyavm2ab3a8k04n"))))
+               "1ijvip427ki177ycrblcn1mfgsq7ixzpvqqfvidjn0a7s2is10bn"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -3777,9 +3777,14 @@ (define-public python-requests-toolbelt
                       (delete-file "tests/test_x509_adapter.py")
                       ;; Fails due to networking (socket.gaierror: [Errno -2]
                       ;; Name or service not known).
-                      (delete-file "tests/test_multipart_encoder.py"))))))
-    (native-inputs
-     (list python-betamax python-mock python-pytest))
+                      (delete-file "tests/test_multipart_encoder.py")
+                      ;; Those tests are not compatible with urllib3 2.0,
+                      ;; according to
+                      ;; https://github.com/requests/toolbelt/pull/356
+                      (delete-file "tests/test_sessions.py")
+                      )))))
+    (native-inputs
+     (list python-betamax python-pyopenssl python-pytest python-trustme))
     (propagated-inputs
      (list python-requests))
     (synopsis "Extensions to python-requests")

base-commit: e4ad2f178af65be6c8ca6e98a667787674cd8c82
-- 
2.43.0

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

From: jgart <jgart <at> dismail.de>
To: 71806 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: Re: [PATCH python-team] gnu: python-requests-toolbelt: Update to
 1.0.0.
Date: Mon, 01 Jul 2024 01:02:41 -0500

Hi Felix,

Can you send a v2 rebased on master.

I can try to apply it and take a look there.

Thanks!

-- 
Best regards,
jgart

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

From: Felix Gruber <felgru <at> posteo.net>
To: 71806 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2] gnu: python-requests-toolbelt: Update to 1.0.0.
Date: Mon,  1 Jul 2024 15:56:59 +0000

* gnu/packages/python-web.scm (python-requests-toolbelt): Update to 1.0.0.
[arguments]: Delete tests that are incompatible with urllib3 >= 2.0.
[native-inputs]: Remove python-mock; add python-pyopenssl and python-trustme.

Change-Id: I349bd9cef34cdbf7a51612e8b9d5dac59101d1bd
---
 gnu/packages/python-web.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 1363e6ccdf..8a007f7402 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
 ;;; Copyright © 2021 Alice Brenon <alice.brenon <at> ens-lyon.fr>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
-;;; Copyright © 2022, 2023 Felix Gruber <felgru <at> posteo.net>
+;;; Copyright © 2022–2024 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2022 Peter Polidoro <peter <at> polidoro.io>
 ;;; Copyright © 2022 Antero Mejr <antero <at> mailbox.org>
 ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701 <at> gmail.com>
@@ -3733,13 +3733,13 @@ (define-public python-requests-mock
 (define-public python-requests-toolbelt
   (package
     (name "python-requests-toolbelt")
-    (version "0.9.1")
+    (version "1.0.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests-toolbelt" version))
              (sha256
               (base32
-               "1h3gm88dcjbd7gm229a7x5qkkhnsqsjz0m0l2xyavm2ab3a8k04n"))))
+               "1ijvip427ki177ycrblcn1mfgsq7ixzpvqqfvidjn0a7s2is10bn"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -3749,9 +3749,14 @@ (define-public python-requests-toolbelt
                       (delete-file "tests/test_x509_adapter.py")
                       ;; Fails due to networking (socket.gaierror: [Errno -2]
                       ;; Name or service not known).
-                      (delete-file "tests/test_multipart_encoder.py"))))))
-    (native-inputs
-     (list python-betamax python-mock python-pytest))
+                      (delete-file "tests/test_multipart_encoder.py")
+                      ;; Those tests are not compatible with urllib3 2.0,
+                      ;; according to
+                      ;; https://github.com/requests/toolbelt/pull/356
+                      (delete-file "tests/test_sessions.py")
+                      )))))
+    (native-inputs
+     (list python-betamax python-pyopenssl python-pytest python-trustme))
     (propagated-inputs
      (list python-requests))
     (synopsis "Extensions to python-requests")

base-commit: 770659059be746bfa42eee2d9118031e5c7604e5
-- 
2.45.1

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

From: jgart <jgart <at> dismail.de>
To: 71806-done <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>, jgart <jgart <at> dismail.de>
Subject: Re: [PATCH python-team] gnu: python-requests-toolbelt: Update to
 1.0.0.
Date: Sat, 13 Jul 2024 09:07:38 -0500

Hi Felix,

Thanks for the contribution!

I applied and pushed with guix style fixes in a separate commit.

-- 
all the best,
jgart

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

From: jgart <jgart <at> dismail.de>
To: 71806 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>, jgart <jgart <at> dismail.de>
Subject: Re: [PATCH python-team] gnu: python-requests-toolbelt: Update to
 1.0.0.
Date: Sat, 13 Jul 2024 09:57:21 -0500

Hi Felix,

Sorry, but I had to revert this commit after noticing that this breaks
the poetry package on master. Could you create a feature branch for
merging this that is not the python-team branch and that passes poetry?

I don't have time at the moment to clean up the python-team branch. I'm
hoping others who worked on that branch can update it and merge it. I
haven't been using that branch myself and it is quite large at the
moment, requiring a lot of git conflict merge fixes.
-- 
all the best,
jgart

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

From: Felix Gruber <felgru <at> posteo.net>
To: jgart <jgart <at> dismail.de>, 71806 <at> debbugs.gnu.org
Subject: Re: [PATCH python-team] gnu: python-requests-toolbelt: Update to
 1.0.0.
Date: Fri, 19 Jul 2024 17:25:28 +0000

Hi jgart,

On 7/13/24 4:57 PM, jgart wrote:
> Sorry, but I had to revert this commit after noticing that this breaks
> the poetry package on master. Could you create a feature branch for
> merging this that is not the python-team branch and that passes poetry?

I don't have commit access to the guix repository, so I can't create a 
feature branch. I've prepared a fix for poetry that I will send in an 
updated patchset to issue 71806 that can be applied to master. Could you 
maybe create that feature branch from my updated patchset?

Best regards,
Felix

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

From: Felix Gruber <felgru <at> posteo.net>
To: 71806 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>, jgart <jgart <at> dismail.de>
Subject: [PATCH v3 2/2] gnu: poetry: Build against newer
 python-requests-toolbelt.
Date: Fri, 19 Jul 2024 17:26:36 +0000

* gnu/packages/python-xyz.scm (poetry)[arguments]: Remove upper version
  bounds on requests-toolbelt dependency.

Change-Id: I0e96dfb36c33935401fc93ff00eaf57b36188bb2
---
 gnu/packages/python-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fcf01f3d04..7ebe8b9e72 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21388,7 +21388,9 @@ (define-public poetry
              (substitute* "setup.py"
                ;; Relax some of the requirements.
                (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring)
-               (("(packaging>=20.4),<21.0" _ packaging) packaging)))))))
+               (("(packaging>=20.4),<21.0" _ packaging) packaging)
+               (("(requests-toolbelt>=0.9.1),<0.10.0" _ requests-toolbelt)
+                requests-toolbelt)))))))
     (propagated-inputs
      (list python-cachecontrol
            python-cachy
-- 
2.43.0

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

From: Felix Gruber <felgru <at> posteo.net>
To: 71806 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>, jgart <jgart <at> dismail.de>
Subject: [PATCH v3 1/2] gnu: python-requests-toolbelt: Update to 1.0.0.
Date: Fri, 19 Jul 2024 17:26:35 +0000

* gnu/packages/python-web.scm (python-requests-toolbelt): Update to 1.0.0.
[arguments]: Delete tests that are incompatible with urllib3 >= 2.0.
[native-inputs]: Remove python-mock; add python-pyopenssl and python-trustme.

Change-Id: I349bd9cef34cdbf7a51612e8b9d5dac59101d1bd
---
 gnu/packages/python-web.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 30da9c8c3c..83620a5867 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
 ;;; Copyright © 2021 Alice Brenon <alice.brenon <at> ens-lyon.fr>
 ;;; Copyright © 2022 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
-;;; Copyright © 2022, 2023 Felix Gruber <felgru <at> posteo.net>
+;;; Copyright © 2022–2024 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2022 Peter Polidoro <peter <at> polidoro.io>
 ;;; Copyright © 2022 Antero Mejr <antero <at> mailbox.org>
 ;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701 <at> gmail.com>
@@ -3759,13 +3759,13 @@ (define-public python-requests-mock
 (define-public python-requests-toolbelt
   (package
     (name "python-requests-toolbelt")
-    (version "0.9.1")
+    (version "1.0.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests-toolbelt" version))
              (sha256
               (base32
-               "1h3gm88dcjbd7gm229a7x5qkkhnsqsjz0m0l2xyavm2ab3a8k04n"))))
+               "1ijvip427ki177ycrblcn1mfgsq7ixzpvqqfvidjn0a7s2is10bn"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -3775,9 +3775,14 @@ (define-public python-requests-toolbelt
                       (delete-file "tests/test_x509_adapter.py")
                       ;; Fails due to networking (socket.gaierror: [Errno -2]
                       ;; Name or service not known).
-                      (delete-file "tests/test_multipart_encoder.py"))))))
-    (native-inputs
-     (list python-betamax python-mock python-pytest))
+                      (delete-file "tests/test_multipart_encoder.py")
+                      ;; Those tests are not compatible with urllib3 2.0,
+                      ;; according to
+                      ;; https://github.com/requests/toolbelt/pull/356
+                      (delete-file "tests/test_sessions.py")
+                      )))))
+    (native-inputs
+     (list python-betamax python-pyopenssl python-pytest python-trustme))
     (propagated-inputs
      (list python-requests))
     (synopsis "Extensions to python-requests")

base-commit: 9724e61cda80e4c59a2eb419a453887ecc551b9a
-- 
2.43.0

Previous Next

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