GNU bug report logs - #77049
[PATCH] gnu: sdkmanager: Update to 0.6.11.

Previous Next

Full log

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

From: Timo Wilken <guix <at> twilken.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: sdkmanager: Update to 0.6.11.
Date: Sun, 16 Mar 2025 14:27:15 +0100

This fixes a failing build of 0.6.5 because that package requires urllib3<2,
but it was given urllib3>=2.

Some unit tests require the network; disable these selectively.

* gnu/packages/android.scm (sdkmanager): Update to 0.6.11; add new test
  dependency; skip network tests.

Change-Id: Ib3d4b63b51ce5b2f18354a41a7c4c104ad07242f
---
 gnu/packages/android.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index cb699b06dc3..b89ceec5017 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -730,16 +730,16 @@ (define-public fastboot
 (define-public sdkmanager
   (package
     (name "sdkmanager")
-    (version "0.6.5")
+    (version "0.6.11")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "sdkmanager" version ".tar.gz"))
               (sha256
                (base32
-                "11as7n2mj3nbqsqb3ivyv9985n73i022s748qvjg36cs8ig50afx"))))
+                "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
     (build-system pyproject-build-system)
     (inputs (list python-requests python-argcomplete python-urllib3 gnupg))
-    (native-inputs (list python-setuptools python-wheel))
+    (native-inputs (list python-setuptools python-wheel python-defusedxml))
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (add-before 'build 'patch-gnupg
@@ -747,7 +747,12 @@ (define-public sdkmanager
                             (substitute* "sdkmanager.py"
                               (("gpgv")
                                (string-append #$(this-package-input "gnupg")
-                                              "/bin/gpgv"))))))))
+                                              "/bin/gpgv")))))
+                        (add-before 'build 'skip-network-tests
+                          (lambda _
+                            (substitute* "test_sdkmanager.py"
+                              (("def (test_checksums_json_mirrors|test_install_and_rerun|test_licenses|test_main_args)\\(.*" all)
+                               (string-append all "\n        self.skipTest('no network connection')\n"))))))))
     (home-page "https://gitlab.com/fdroid/sdkmanager")
     (synopsis "Replacement for Android sdkmanager written in Python")
     (description
-- 
2.48.1

Previous Next

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