From patchwork Thu Feb 15 20:46:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 60416 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 AAE8927BBEA; Thu, 15 Feb 2024 20:48:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 1625127BBE2 for ; Thu, 15 Feb 2024 20:48:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raie9-00012G-ED; Thu, 15 Feb 2024 15:47:53 -0500 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 1raie1-0000za-Ry for guix-patches@gnu.org; Thu, 15 Feb 2024 15:47:46 -0500 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 1raie0-0003XJ-IC; Thu, 15 Feb 2024 15:47:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raieJ-0005E5-BG; Thu, 15 Feb 2024 15:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66690] [PATCH v2 2/8] gnu: python-ruamel-yaml: Update to 0.18.6. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 20:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66690 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 66690@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Arun Isaac , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66690-submit@debbugs.gnu.org id=B66690.170803004019910 (code B ref 66690); Thu, 15 Feb 2024 20:48:03 +0000 Received: (at 66690) by debbugs.gnu.org; 15 Feb 2024 20:47:20 +0000 Received: from localhost ([127.0.0.1]:57546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raidc-0005B4-2X for submit@debbugs.gnu.org; Thu, 15 Feb 2024 15:47:20 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:46710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raida-0005At-8J for 66690@debbugs.gnu.org; Thu, 15 Feb 2024 15:47:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wm5Y63hBMOYBP5mp5ifDJzpvvC3Y73vgs1ljd8Wvg9A=; b=knQVQ23NOG2aaI8EdzSMYPdqFi PcJph7EGEXWq2vxrGYcQ4+NUce6UdQK5COQeAgDFPWG4qPCgoJzCMtnSAHvg1/k3mCjQU5s19H8XB OfvmOXONd8U6dOZxSKsiZqCGirLi+yWP3b+M1oLCqe9WR/KAO8LEJfblS3Hs0c2NdAhp4OXygt6N6 IPHHX5PXbhqZMIyVpCxQM+SRE04u80v6FDYVqTbQcfFvOX+XqwK9Elb7kOIfLYJbwHbk327bmjf9h ByYlQougQHT0So04Nj2jtelBahZA4H84UUugerUtfE/26E0WfZ3skxs0A8FuNVKVsI+kNIwSpYRza PNmjs+HQ==; Received: from [192.168.2.1] (port=57126 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1raic4-0004iN-0E; Thu, 15 Feb 2024 20:45:44 +0000 From: Arun Isaac Date: Thu, 15 Feb 2024 20:46:19 +0000 Message-ID: <14917e292b584625ac25971a4b02cfef83101b9e.1708029746.git.arunisaac@systemreboot.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/package/serialization.scm (python-ruamel-yaml): Update to 0.18.6. (python-ruamel.yaml-0.16): New variable. * gnu/packages/package-management.scm (conda)[inputs]: Replace python-ruamel.yaml with python-ruamel.yaml-0.16. Change-Id: Iff9eeeae043c9547d93a6c780f0c30bd760490d9 --- gnu/packages/package-management.scm | 3 ++- gnu/packages/serialization.scm | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c1ad613bee..5d6bc47b8b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2022, 2023 Zhu Zihao ;;; Copyright © 2023 jgart ;;; Copyright © 2023 Mădălin Ionel Patrașcu +;;; Copyright © 2024 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1251,7 +1252,7 @@ (define-public conda python-pyyaml python-requests python-responses - python-ruamel.yaml + python-ruamel.yaml-0.16 python-tqdm ;; XXX: This is dragged in by libarchive and is needed at runtime. zstd)) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 963028c734..240646748b 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -721,14 +721,14 @@ (define-public python-msgspec (define-public python-ruamel.yaml (package (name "python-ruamel.yaml") - (version "0.16.13") + (version "0.18.6") (source (origin (method url-fetch) (uri (pypi-uri "ruamel.yaml" version)) (sha256 (base32 - "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v")))) + "06rimidc9nb3i3r90n3a1zwf0qxw24zqykb3wpxwd1p72yifc9wb")))) (build-system python-build-system) (native-inputs (list python-pytest)) @@ -747,6 +747,18 @@ (define-public python-ruamel.yaml style and key ordering are kept, so you can diff the source.") (license license:expat))) +(define-public python-ruamel.yaml-0.16 + (package + (inherit python-ruamel.yaml) + (version "0.16.13") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ruamel.yaml" version)) + (sha256 + (base32 + "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v")))))) + (define-public python-ruamel.yaml.clib (package (name "python-ruamel.yaml.clib")