[bug#66417] [PATCH 0/3] Bump python-google-api-client to version 2

[bug#66417] [PATCH 0/3] Bump python-google-api-client to version 2

[Pierre-Evariste Dagand]

Only version 1 of the Google API client was supported in Guix. However, the
build of python-google-auth-1 fails to self-test due to outdated libraries
(missing python-mock dependency and, most importantly, outdated version of
python-cryptography).

This patch series move the Google API client to version 2. It adds support for
python-google-auth-oauthlib (new dependency of version 2 of
python-google-auth). It also, tentatively, garbage collect
python-google-api-core-1.

Pierre-Evariste Dagand (3):
  gnu: Add python-google-auth-oauthlib.
  gnu: python-google-api-client: Update to 2.102.0
  gnu: Remove python-google-api-core-1 and its dependency
    python-google-auth-1

 gnu/packages/python-web.scm | 115 +++++++++---------------------------
 1 file changed, 27 insertions(+), 88 deletions(-)


base-commit: 9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554
-- 
2.41.0

[bug#66417] [PATCH 1/3] gnu: Add python-google-auth-oauthlib.

[Pierre-Evariste Dagand]

* gnu/packages/python-web.scm (python-google-auth-oauthlib): New variable.
---
 gnu/packages/python-web.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d7fe634aba..0e52f2fdbd 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5180,6 +5180,26 @@ (define-public python-google-auth-httplib2
 for httplib2 transport.")
     (license license:asl2.0)))
 
+(define-public python-google-auth-oauthlib
+  (package
+    (name "python-google-auth-oauthlib")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "google-auth-oauthlib" version))
+       (sha256
+        (base32 "1yvsjd1vh440nsh9vpnig23sq4k1ia749x5g1dwm7r4110xqrsl3"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-google-auth python-requests-oauthlib))
+    (native-inputs (list python-flask))
+    (home-page
+     "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib")
+    (synopsis "Google Authentication Library: oauthlib")
+    (description "This package provides a Google Authentication Library plugin
+with oauthlib.")
+    (license license:asl2.0)))
+
 (define-public whoogle-search
   (package
     (name "whoogle-search")
-- 
2.41.0

[bug#66417] [PATCH 2/3] gnu: python-google-api-client: Update to 2.102.0

[Pierre-Evariste Dagand]

* gnu/packages/python-web.scm (python-google-api-client): Update to 2.102.0
* gnu/packages/python-web.scm (python-google-auth-httplib2): Update to 0.1.1
---
 gnu/packages/python-web.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0e52f2fdbd..4dcc5b5fb9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5136,22 +5136,23 @@ (define-public python-google
 (define-public python-google-api-client
   (package
     (name "python-google-api-client")
-    (version "1.12.8")
+    (version "2.102.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "google-api-python-client" version))
        (sha256
         (base32
-         "1fq89wifa9ymby655is246w5d54ixybffj5vz7lwzhpf8926ifgk"))))
+         "07b9afz3g3lk976i974h6ikvl7wzwm0a0ws0iynxvmd4favgjvwh"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f))    ; tests require internet access
     (propagated-inputs
-     (list python-google-api-core-1
-           python-google-auth-1
+     (list python-google-api-core
+           python-google-auth
            python-google-auth-httplib2
            python-httplib2
+           python-pyparsing
            python-six
            python-uritemplate-3))
     (home-page "https://github.com/google/google-api-python-client")
@@ -5162,12 +5163,12 @@ (define-public python-google-api-client
 (define-public python-google-auth-httplib2
   (package
     (name "python-google-auth-httplib2")
-    (version "0.1.0")
+    (version "0.1.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "google-auth-httplib2" version))
               (sha256
-               (base32 "1b1hrhah01hx6bj3rb83iybrdwqv0bbdy63py39srv1bcgykjz50"))))
+               (base32 "0agwwgw04nks7lzpm224fbvpnjfgzz67pkrfls77ipf6zmawajy6"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-google-auth python-httplib2 python-six))
-- 
2.41.0

[bug#66417] [PATCH 3/3] gnu: Remove python-google-api-core-1 and its dependency python-google-auth-1

[Pierre-Evariste Dagand]

python-google-auth-1 doesn't self-test anymore. The tests depend on
`python-mock` (easy to fix) but also on an outdated version of
`python-cryptography`.
---
 gnu/packages/python-web.scm | 82 -------------------------------------
 1 file changed, 82 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4dcc5b5fb9..977258acf6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7567,42 +7567,6 @@ (define-public python-google-auth
 server-to-server authentication mechanisms to access Google APIs.")
     (license license:asl2.0)))
 
-(define-public python-google-auth-1
-  (package
-    (inherit python-google-auth)
-    (name "python-google-auth")
-    (version "1.35.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "google-auth" version))
-       (sha256
-        (base32 "13nqj6hikvbdmbs1vb78c88ym0pd03m09ch00biqw64c0blkn0xp"))))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest")))))))
-    (propagated-inputs
-     (list python-cachetools
-           python-pyasn1-modules
-           python-rsa
-           python-six
-           ;; For the extras
-           python-pyopenssl
-           python-pyu2f))
-    (native-inputs
-     (list python-flask
-           python-freezegun
-           python-oauth2client
-           python-pytest
-           python-pytest-localserver
-           python-requests
-           python-responses
-           python-urllib3))))
-
 (define-public python-google-resumable-media
   (package
     (name "python-google-resumable-media")
@@ -7702,52 +7666,6 @@ (define-public python-google-api-core
 clients.")
     (license license:asl2.0)))
 
-(define-public python-google-api-core-1
-  (package
-    (inherit python-google-api-core)
-    (name "python-google-api-core")
-    (version "1.32.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "google-api-core" version))
-       (sha256
-        (base32 "0709va9sisll7axkv6ii2x5s0ls38rqp1jnvs6nkpmg7z163q70h"))))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (for-each
-                 delete-file
-                 '(;; The test suite can't find AsyncMock.
-                   "tests/asyncio/test_page_iterator_async.py"
-                   "tests/asyncio/test_retry_async.py"
-                   ;; Skip the tests depending on grpc.
-                   "tests/asyncio/test_operation_async.py"
-                   "tests/asyncio/test_grpc_helpers_async.py"
-                   "tests/asyncio/operations_v1/test_operations_async_client.py"
-                   "tests/unit/test_bidi.py"
-                   "tests/unit/test_exceptions.py"
-                   "tests/unit/test_grpc_helpers.py"
-                   "tests/unit/test_operation.py"
-                   "tests/unit/operations_v1/test_operations_client.py"))
-               (delete-file-recursively "tests/asyncio/gapic")
-               (delete-file-recursively "tests/unit/gapic")
-               (invoke "pytest" "-k" "not test_constructor_defaults")))))))
-    (propagated-inputs
-     (list python-google-auth-1
-           python-googleapis-common-protos
-           python-packaging
-           python-protobuf
-           python-proto-plus
-           python-pytz
-           python-requests))
-    (native-inputs
-     (list python-pytest
-           python-pytest-asyncio))))
-
 (define-public python-google-cloud-core
   (package
     (name "python-google-cloud-core")
-- 
2.41.0

bug#66417: [PATCH 0/3] Bump python-google-api-client to version 2

[Ludovic Courtès]

Hello,

Pierre-Evariste Dagand <doc@evr.ist> skribis:

>   gnu: Add python-google-auth-oauthlib.
>   gnu: python-google-api-client: Update to 2.102.0
>   gnu: Remove python-google-api-core-1 and its dependency
>     python-google-auth-1

I tweaked the commit log and applied it, thanks!

Ludo’.