From unknown Sun Jun 15 08:30:39 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#77049 <77049@debbugs.gnu.org> To: bug#77049 <77049@debbugs.gnu.org> Subject: Status: [PATCH] gnu: sdkmanager: Update to 0.6.11. Reply-To: bug#77049 <77049@debbugs.gnu.org> Date: Sun, 15 Jun 2025 15:30:39 +0000 retitle 77049 [PATCH] gnu: sdkmanager: Update to 0.6.11. reassign 77049 guix-patches submitter 77049 Timo Wilken severity 77049 normal tag 77049 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 16 09:28:03 2025 Received: (at submit) by debbugs.gnu.org; 16 Mar 2025 13:28:03 +0000 Received: from localhost ([127.0.0.1]:46168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tto27-00047k-3w for submit@debbugs.gnu.org; Sun, 16 Mar 2025 09:28:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45190) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tto23-00046M-Ts for submit@debbugs.gnu.org; Sun, 16 Mar 2025 09:28:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tto1x-0004Tf-PF for guix-patches@gnu.org; Sun, 16 Mar 2025 09:27:53 -0400 Received: from mx1.mythic-beasts.com ([2a00:1098:0:86:1000:0:2:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tto1v-0003I3-Gw for guix-patches@gnu.org; Sun, 16 Mar 2025 09:27:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=twilken.net ; s=mythic-beasts-k1; h=Date:Subject:To:From; bh=SoVD5WoXEhk5bZeqJW52tGaI4krmz9fT0fxHWky1nk4=; b=QRJ8/Ui3dE5CMNp2Nr4TuvTUli 8wr1lnLfSkzmZk2ob1yl+5ERIaf1xyrVBMcxKcYZkiK6ZJ7kXZ4bEln6fSCmXTIeJ3TVobBp+o/03 7ngyPpd0OldtLWXD5DNiZdIIQ8n4WMoIEq/spi9liQc/stxxu7VvxunfdJHKSzrIpVFvXf3+YnoDp 7SvkDFmHAs5Ynhz85SdWE3+WGS7Ir1CdYSDMLN9QZ/cQ4XfmoIDcGCVN6YshAZ43GKSTphu4iZQAG Pzs0bX3r6faOmWA2/TMJn0uAdHmSyfdzXolFjpl/hLTgp0E+MD9kSipY36NHKzc8TA2qeN3c/7Fyg hA7Fj05A==; Received: by mailhub-cam-d.mythic-beasts.com with esmtpa (Exim 4.94.2) (envelope-from ) id 1tto1t-00Dasz-Gx for guix-patches@gnu.org; Sun, 16 Mar 2025 13:27:49 +0000 From: Timo Wilken To: guix-patches@gnu.org Subject: [PATCH] gnu: sdkmanager: Update to 0.6.11. Date: Sun, 16 Mar 2025 14:27:15 +0100 Message-ID: <20250316132714.24452-2-guix@twilken.net> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BlackCat-Spam-Score: 49 X-Spam-Status: No, score=4.9 Received-SPF: pass client-ip=2a00:1098:0:86:1000:0:2:1; envelope-from=guix@twilken.net; helo=mx1.mythic-beasts.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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