[bug#73203] [PATCH 0/3] Fix python-azure packages.

[bug#73203] [PATCH 0/3] Fix python-azure packages.

[Nicolas Graves via Guix-patches via]

This patch series updates packages dependent on the deprecated package
python-msrest (which failed to build anyway).

Nicolas Graves (3):
  gnu: python-azure-core: Update to 1.28.0.
  gnu: python-azure-storage-blob: Update to 12.22.0.
  gnu: Remove python-msrest.

 gnu/packages/python-web.scm | 127 ++++++++++--------------------------
 1 file changed, 34 insertions(+), 93 deletions(-)

-- 
2.46.0

[bug#73203] [PATCH 1/3] gnu: python-azure-core: Update to 1.28.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-azure-core): Update to 1.28.0.
[build-system]: Move to pyproject-build-system.
[arguments]<#:test-flags>: Use it.
           <#:phases>: Move from check phase replacement to a lighter
           'add-test-pythonpath pre-check phase.
[propagated-inputs]: Remove python-trio.
[native-inputs]: Remove python-msrest.

Change-Id: Ie4656ddaa1919144cc75a81feecb9ec774c9436f
---
 gnu/packages/python-web.scm | 66 +++++++++++++++----------------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e94d0c44b9..5b75fd06ea 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8069,59 +8069,45 @@ (define-public python-azure-common
 (define-public python-azure-core
   (package
     (name "python-azure-core")
-    (version "1.24.0")
+    (version "1.28.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "azure-core" version ".zip"))
        (sha256
-        (base32 "1r8bpn3zz02mj00qbaks5qq49wqd3mznkm90bchd1mxa3w21nnrl"))))
-    (build-system python-build-system)
+        (base32 "1g9nv5pcjkskv37vsjgsm7am81y629flwkghnvd5dphzzikgrvp9"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               ;; This fails because devtools_testutils doesn't exist.
-               (delete-file "tests/test_connection_string_parsing.py")
-               ;; Needs network.
-               (for-each delete-file
-                         '("tests/async_tests/test_streaming_async.py"
-                           "tests/test_streaming.py"))
-               (add-installed-pythonpath inputs outputs)
-               (setenv "PYTHONPATH"
-                       (string-append (getcwd) "/tests/testserver_tests/coretestserver:"
-                                      (getenv "GUIX_PYTHONPATH")))
-               (invoke "pytest"
-                       ;; Most of these need network access.
-                       "-m" "not asyncio and not live_test_only"
-                       "-k"
-                       ;; These need network access.
-                       (string-append
-                        "not test_example_raw_response_hook"
-                        " and not test_example_headers_policy"
-                        " and not test_example_request_id_policy"
-                        " and not test_example_user_agent_policy"
-                        " and not test_example_requests"
-                        " and not test_example_pipeline"
-                        " and not test_example_pipeline_client"
-                        " and not test_example_redirect_policy"
-                        " and not test_example_no_redirects"
-                        " and not test_example_retry_policy"
-                        " and not test_example_no_retries"
-                        " and not test_decompress_plain_no_header"
-                        " and not test_compress_plain_no_header"
-                        " and not test_decompress_compressed_no_header"))))))))
+     (list
+      #:test-flags
+      `(list ;; This fails because devtools_testutils doesn't exist.
+        "--ignore=tests/test_connection_string_parsing.py"
+        ;; These all need network access.
+        "--ignore=samples"
+        "--ignore=tests/async_tests/test_streaming_async.py"
+        "--ignore=tests/test_streaming.py"
+        "-m" "not asyncio and not live_test_only"
+        "-k" ,(string-append
+               "not test_decompress_plain_no_header"
+               " and not test_compress_plain_no_header"
+               " and not test_decompress_compressed_no_header"
+               " and not test_requests_socket_timeout"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'add-test-pythonpath
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "PYTHONPATH"
+                        (string-append
+                         (getcwd) "/tests/testserver_tests/coretestserver:"
+                         (getenv "GUIX_PYTHONPATH")))))))))
     (propagated-inputs
      (list python-aiohttp
            python-requests
            python-six
-           python-trio
            python-typing-extensions))
     (native-inputs
      (list python-flask
-           python-msrest
            python-pytest
            python-pytest-aiohttp
            python-pytest-asyncio
-- 
2.46.0

[bug#73203] [PATCH 2/3] gnu: python-azure-storage-blob: Update to 12.22.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-azure-storage-blob): Update to 12.22.0.
[build-system]: Move to pyproject-build-system.
[propagated-inputs]: Remove python-msrest. Add python-isodate and
  python-typing-extensions.

Change-Id: If7163dd4568136a19799b78e9fce246ab0611cbd
---
 gnu/packages/python-web.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5b75fd06ea..03d21f77d7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8122,17 +8122,19 @@ (define-public python-azure-core
 (define-public python-azure-storage-blob
   (package
     (name "python-azure-storage-blob")
-    (version "12.12.0")
+    (version "12.22.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "azure-storage-blob" version ".zip"))
+       (uri (pypi-uri "azure-storage-blob" version))
        (sha256
-        (base32 "1xv23ph822qywjxs81say9xi5dzmvxcii6sww6d1hvd83iyz1npn"))))
-    (build-system python-build-system)
+        (base32 "0vkkngiybx5372j9vc9p4wn6hakpv99l0ipsf4kw7ccazss4p05k"))))
+    (build-system pyproject-build-system)
     (propagated-inputs
-     (list python-azure-core python-cryptography python-msrest))
-    (native-inputs (list unzip))
+     (list python-azure-core
+           python-cryptography
+           python-isodate
+           python-typing-extensions))
     (home-page "https://github.com/Azure/azure-sdk-for-python/")
     (synopsis "Microsoft Azure Blob Storage client library for Python")
     (description "This package provides the Microsoft Azure Blob Storage
-- 
2.46.0

[bug#73203] [PATCH 3/3] gnu: Remove python-msrest.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-msrest): Delete variable.

Change-Id: Ic27ba6fe0e7f828327e98c99eabf536ea1cd544a
---
 gnu/packages/python-web.scm | 47 -------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 03d21f77d7..c51ac642ca 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7960,53 +7960,6 @@ (define-public python-siosocks
 @end itemize")
     (license license:expat)))
 
-(define-public python-msrest
-  (package
-    (name "python-msrest")
-    (version "0.6.21")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "msrest" version))
-       (sha256
-        (base32 "1n389m3hcsyjskzimq4j71nyw9pjkrp0n5wg1q2c4bfwpv3inrkj"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest"
-                       "-k"
-                       ;; These attempt to connect to bing.com.
-                       (string-append
-                        "not test_basic_aiohttp"
-                        " and not test_basic_async_requests"
-                        " and not test_conf_async_requests"
-                        " and not test_conf_async_trio_requests"
-                        " and not test_basic_aiohttp"
-                        " and not test_basic_async_requests"
-                        " and not test_conf_async_requests"
-                        " and not test_conf_async_trio_requests"))))))))
-    (propagated-inputs
-     (list python-aiohttp
-           python-certifi
-           python-isodate
-           python-requests
-           python-requests-oauthlib))
-    (native-inputs
-     (list python-httpretty
-           python-pytest
-           python-pytest-aiohttp
-           python-pytest-asyncio
-           python-pytest-trio))
-    (home-page "https://github.com/Azure/msrest-for-python")
-    (synopsis "AutoRest swagger generator Python client runtime")
-    (description "This package provides the runtime library @code{msrest} for
-AutoRest-generated Python clients.")
-    (license license:expat)))
-
 (define-public python-azure-nspkg
   (package
     (name "python-azure-nspkg")
-- 
2.46.0

[bug#73203] QA review for 73203

[Lars Bilke]

user guix
usertag 73203 + reviewed-looks-good
thanks

Guix QA review form submission:
I tried your patches locally and they worked well! Thanks!

Items marked as checked: Package builds, Commit messages

bug#73203: QA review for 73203

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

Lars Bilke <lars.bilke@ufz.de> writes:

> user guix
> usertag 73203 + reviewed-looks-good
> thanks
>
> Guix QA review form submission:
> I tried your patches locally and they worked well! Thanks!
>
> Items marked as checked: Package builds, Commit messages

THanks both, I've pushed these patches to master as
86764929f9929f7e0f0d9beeaa3125a6db719b16.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]