From patchwork Thu Oct 26 18:38:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 55373 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD55627BBE2; Thu, 26 Oct 2023 19:40:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6AB5027BBEA for ; Thu, 26 Oct 2023 19:40:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qw5GY-0000VB-Dw; Thu, 26 Oct 2023 14:39:34 -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 1qw5GW-0000US-Lq for guix-patches@gnu.org; Thu, 26 Oct 2023 14:39:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qw5GW-0005T6-E0 for guix-patches@gnu.org; Thu, 26 Oct 2023 14:39:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qw5H1-0008CK-AK for guix-patches@gnu.org; Thu, 26 Oct 2023 14:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66766] [PATCH 1/3] gnu: ansible-core: Update to 2.15.5 and fix tests. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Oct 2023 18:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66766@debbugs.gnu.org Received: via spool by 66766-submit@debbugs.gnu.org id=B66766.169834557131448 (code B ref 66766); Thu, 26 Oct 2023 18:40:03 +0000 Received: (at 66766) by debbugs.gnu.org; 26 Oct 2023 18:39:31 +0000 Received: from localhost ([127.0.0.1]:34484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qw5GU-0008B5-Fl for submit@debbugs.gnu.org; Thu, 26 Oct 2023 14:39:30 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:53394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qw5GR-0008AV-Ho for 66766@debbugs.gnu.org; Thu, 26 Oct 2023 14:39:28 -0400 Received: from [2603:6080:a200:1c76::19a] (helo=mimolette.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qw5Fr-0002X3-DF for 66766@debbugs.gnu.org; Thu, 26 Oct 2023 14:38:51 -0400 From: Jack Hill Date: Thu, 26 Oct 2023 14:38:37 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <28cf2040-3e78-dc66-7a6e-1d8742ea16dc@jackhill.us> References: <28cf2040-3e78-dc66-7a6e-1d8742ea16dc@jackhill.us> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (ansible-core): Update to 2.15.5. [#:phases]: Enable tests that now pass and choose the right ansible-test to invoke. [propagated-inputs]: replace python-resolvelib-0.5 with python-resolvelib. Change-Id: Ibda3222a16fefb1484affdb62e38a3a07ce61986 --- gnu/packages/admin.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) base-commit: cbd20d627497053871db863970c07d93c7081786 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f72b0eeae..c1327d54a5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2835,13 +2835,13 @@ (define-public fdupes (define-public ansible-core (package (name "ansible-core") - (version "2.14.4") + (version "2.15.5") (source (origin (method url-fetch) (uri (pypi-uri "ansible-core" version)) (sha256 - (base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh")))) + (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc")))) (build-system python-build-system) (arguments `(#:modules ((guix build python-build-system) @@ -2911,14 +2911,6 @@ (define-public ansible-core (when tests? ;; Otherwise Ansible fails to create its config directory. (setenv "HOME" "/tmp") - ;; This test module messes up with sys.path and causes many - ;; test failures. - (delete-file "test/units/_vendor/test_vendor.py") - ;; The test fails when run in the container, for reasons - ;; unknown. - (delete-file "test/units/utils/test_display.py") - ;; This test fail for reasons unknown. - (delete-file "test/units/cli/test_adhoc.py") ;; These tests fail in the container; it appears that the ;; mocking of the absolute file names such as /usr/bin/svcs do ;; not work as intended there. @@ -2933,7 +2925,7 @@ (define-public ansible-core ;; does some extra environment setup. Taken from ;; https://raw.githubusercontent.com/ansible/ansible/\ ;; devel/test/utils/shippable/shippable.sh. - (invoke "ansible-test" "units" "-v" + (invoke "./bin/ansible-test" "units" "-v" "--num-workers" (number->string (parallel-job-count))))))))) (native-inputs @@ -2954,7 +2946,7 @@ (define-public ansible-core python-jinja2 python-pyyaml python-packaging ;for version number parsing - python-resolvelib-0.5)) + python-resolvelib)) (home-page "https://www.ansible.com/") (synopsis "Radically simple IT automation") (description "Ansible aims to be a radically simple IT automation system.