From patchwork Fri Oct 27 13:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 55390 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 17B0227BBEA; Fri, 27 Oct 2023 14:47:09 +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 5512A27BBE2 for ; Fri, 27 Oct 2023 14:47:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwNAm-0005L6-NH; Fri, 27 Oct 2023 09:46:48 -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 1qwNAW-0005Jd-1X for guix-patches@gnu.org; Fri, 27 Oct 2023 09:46:35 -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 1qwNAV-0001J2-1J for guix-patches@gnu.org; Fri, 27 Oct 2023 09:46:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwNB0-0004aW-0R for guix-patches@gnu.org; Fri, 27 Oct 2023 09:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66766] [PATCH v3 1/3] gnu: ansible-core: Update to 2.15.5 and fix tests. References: <28cf2040-3e78-dc66-7a6e-1d8742ea16dc@jackhill.us> In-Reply-To: <28cf2040-3e78-dc66-7a6e-1d8742ea16dc@jackhill.us> Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 13:47:01 +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.169841441717619 (code B ref 66766); Fri, 27 Oct 2023 13:47:01 +0000 Received: (at 66766) by debbugs.gnu.org; 27 Oct 2023 13:46:57 +0000 Received: from localhost ([127.0.0.1]:35372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNAu-0004a2-F2 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:57 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:37184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNAq-0004Zb-EM for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:55 -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 1qwNAF-00034N-Dp for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:15 -0400 From: Jack Hill Date: Fri, 27 Oct 2023 09:46:02 -0400 Message-ID: <08dc3889305b13fa8cee6244474ed6a105dc30fb.1698414364.git.jackhill@jackhill.us> X-Mailer: git-send-email 2.41.0 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: a69dec71493c1ecf06071d3304038f3648de69c4 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 67d836112d..9e28d2e8c0 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. From patchwork Fri Oct 27 13:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 55391 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 5219C27BBE2; Fri, 27 Oct 2023 14:47:55 +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 autolearn=unavailable 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 5BA2E27BBE9 for ; Fri, 27 Oct 2023 14:47:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwNBW-0005dZ-0W; Fri, 27 Oct 2023 09:47: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 1qwNBU-0005aO-R0 for guix-patches@gnu.org; Fri, 27 Oct 2023 09:47: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 1qwNBU-0001RR-EJ; Fri, 27 Oct 2023 09:47:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwNBy-0004cl-Hp; Fri, 27 Oct 2023 09:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66766] [PATCH v3 2/3] gnu: Remove python-resolvelib@0.5. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 13:48:02 +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 Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 66766-submit@debbugs.gnu.org id=B66766.169841442317669 (code B ref 66766); Fri, 27 Oct 2023 13:48:02 +0000 Received: (at 66766) by debbugs.gnu.org; 27 Oct 2023 13:47:03 +0000 Received: from localhost ([127.0.0.1]:35378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNB1-0004av-GL for submit@debbugs.gnu.org; Fri, 27 Oct 2023 09:47:03 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:37188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNAq-0004Zc-Dc for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:56 -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 1qwNAF-00034N-OC for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:15 -0400 From: Jack Hill Date: Fri, 27 Oct 2023 09:46:03 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <08dc3889305b13fa8cee6244474ed6a105dc30fb.1698414364.git.jackhill@jackhill.us> References: <08dc3889305b13fa8cee6244474ed6a105dc30fb.1698414364.git.jackhill@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/python-xyz.scm (python-resolvelib-0.5): Delete variable. This was only used by ansible-core which can now use the newer version. Change-Id: Ic40e21561807ed5faae466e13193892e4f9aa6ae --- gnu/packages/python-xyz.scm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6b991c448b..96ccf38c54 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13763,22 +13763,6 @@ (define-public python-resolvelib includes dependency resolution logic.") (license license:isc))) -;;; This older version is required by ansible-core. -(define-public python-resolvelib-0.5 - (package/inherit python-resolvelib - (name "python-resolvelib") - (version "0.5.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sarugaku/resolvelib") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0697y330sqhiclk25v151qxg7aixzpj434lbg5qib0qlna5zg9la")))))) - (define-public python-commonmark (package (name "python-commonmark") From patchwork Fri Oct 27 13:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 55389 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 1E66927BBEA; Fri, 27 Oct 2023 14:47:07 +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 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 93B9227BBE2 for ; Fri, 27 Oct 2023 14:47:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwNAi-0005Kd-QK; Fri, 27 Oct 2023 09:46:44 -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 1qwNAW-0005Jc-10 for guix-patches@gnu.org; Fri, 27 Oct 2023 09:46:35 -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 1qwNAV-0001J5-83 for guix-patches@gnu.org; Fri, 27 Oct 2023 09:46:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwNB0-0004ad-DG for guix-patches@gnu.org; Fri, 27 Oct 2023 09:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66766] [PATCH v3 3/3] gnu: ansible: Update to 8.5.0. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 13:47:02 +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.169841441717626 (code B ref 66766); Fri, 27 Oct 2023 13:47:02 +0000 Received: (at 66766) by debbugs.gnu.org; 27 Oct 2023 13:46:57 +0000 Received: from localhost ([127.0.0.1]:35374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNAv-0004a8-5e for submit@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:57 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:37190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwNAq-0004Zd-Me for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:55 -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 1qwNAG-00034N-23 for 66766@debbugs.gnu.org; Fri, 27 Oct 2023 09:46:16 -0400 From: Jack Hill Date: Fri, 27 Oct 2023 09:46:04 -0400 Message-ID: <7531acb3653cabe1eec758b3c9102fde53131fc1.1698414364.git.jackhill@jackhill.us> X-Mailer: git-send-email 2.41.0 In-Reply-To: <08dc3889305b13fa8cee6244474ed6a105dc30fb.1698414364.git.jackhill@jackhill.us> References: <08dc3889305b13fa8cee6244474ed6a105dc30fb.1698414364.git.jackhill@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): Update to 8.5.0. Change-Id: I38ac84a0945f3ba10e13246cf8ae95c3795b52b3 --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9e28d2e8c0..afbcf7fda6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2973,13 +2973,13 @@ (define-public ansible-core (define-public ansible (package (name "ansible") - (version "7.4.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "142barhwz0wx5kn74xi0bfl21iwq2yq3jp14kxajsg9nggndcr09")))) + (base32 "0bazj5h12wraf30bb2schzwk553y20n9vh45km4b5kgmvadm0z1j")))) (build-system python-build-system) (propagated-inputs (list ansible-core)) ;; The Ansible collections are found by ansible-core via the Python search