From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WJh8Fap4zmUmgQAA62LTzQ:P1 (envelope-from ) for ; Thu, 15 Feb 2024 21:48:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WJh8Fap4zmUmgQAA62LTzQ (envelope-from ) for ; Thu, 15 Feb 2024 21:48:42 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=WtCyWkPi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708030122; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xkA/mN4KuPra2RQGb4ydlRKIhh8Qq9aHppA3EsigD2o=; b=B+1G0/zpgCgvCJk0Vc+9w+xhr0Vh0ArhYEiemYc5tHWiTjm9Oa0ilDVOigxkPQYAhmBFkz jISfGWn3HJQ1U906Q9RJudyzYod5rI7mab2gfWvRFYDrlHPMrDTuZ8Q5cFD+20O3DDLcUL TkZ2e8Z/zWo4tlL1s1p6KVfkDYkhPGaEEJIqpz8itWVPGU14bW001CMJIuZrSl2UQ19+Ep lNb7U42pJ0Iuwpg6/+yu8QnYh8h/HTW6Qjb9uLZH71sJNXfoSD9kwkdT+Dw4ylZYSgEkZC UNaacqcoVAY3Fin+r1FH9Kl7vSV495h+3oRyjTu1cMXZHsO+wXXFrmbkx2YNSw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=WtCyWkPi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708030122; a=rsa-sha256; cv=none; b=kQMSAIc59ZszRIiRwKRA7t6JccQtQRd5AmX0EZGzc4xDawhKFSaEybFEPQmUuE2HIIX1Zl Sbm6hH4EpIsU6O+Xf0SgZjZD262K3MCExaMa2tUxOlTWs96pq02Tn2D9sISVC8mn3hgT6G s22a2syHypmP6QGAaDymzZa5h9pEX6/VeSDBu558CEk3x3ZvZTjFvD67Zhw0KuhBYfAgFK hhjv39ElYVs3uNp8Q/VwgYQKqnAARWV43TqQr0VydH+v3qOuSX8YNbqVogGeSXcHceruW4 /yLUtE3BZYNYukPhhMoDArEvMKL+rl+7e46DEqFsqFi4W33ggceiqw+Y1GTfHw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 26D556CF4C for ; Thu, 15 Feb 2024 21:48:42 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raie9-00012j-UV; 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 1raie2-0000zb-3c 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 1raie1-0003XL-RB; Thu, 15 Feb 2024 15:47:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raieJ-0005EF-OC; Thu, 15 Feb 2024 15:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66690] [PATCH v2 3/8] gnu: python-schema-salad: Update to 8.5.20240102191335. 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.170803004519932 (code B ref 66690); Thu, 15 Feb 2024 20:48:03 +0000 Received: (at 66690) by debbugs.gnu.org; 15 Feb 2024 20:47:25 +0000 Received: from localhost ([127.0.0.1]:57550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raidg-0005BQ-JT for submit@debbugs.gnu.org; Thu, 15 Feb 2024 15:47:24 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:59006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raidc-0005Aw-7o for 66690@debbugs.gnu.org; Thu, 15 Feb 2024 15:47:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type: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=xkA/mN4KuPra2RQGb4ydlRKIhh8Qq9aHppA3EsigD2o=; b=WtCyWkPiUTREkR+s7rWhz6iEL3 iaZyvnyqz/eUPLxGKhJxQMXVn8nW5jLrpA38CaR2h+/t4BU01uD+W9RCjMz9HiWgOfSPtOiFN7hWF f3M7Ar+IUpWC89KbVPRszlo1CVTTq5XS6KEU+X+eF0XUi7N1/epGukz2w2k7P0MdahMsAEX6Dvg6/ TCA89E9FTDZO+TiGnk45Y5JtDunwjhpRMpL0vkG001WK9Xyq8I1UsR6woq5hbYcllxnxGA2TZx/V8 E37iayGCNLpUl2UELFQzJSCh/mRiO3pO1UTt5DxoBOn4vymlTReHKf51Zd8GE0VikZp8dnMZm0gAC vtjFAfJQ==; 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 1raic7-0004iN-0o; Thu, 15 Feb 2024 20:45:47 +0000 From: Arun Isaac Date: Thu, 15 Feb 2024 20:46:20 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -2.01 X-Spam-Score: -2.01 X-Migadu-Queue-Id: 26D556CF4C X-TUID: 8PzP48S54pQ9 * gnu/packages/bioinformatics.scm (python-schema-salad): Update to 8.5.20240102191335. [native-inputs]: Add python-pytest-xdist. [propagated-inputs]: Add python-importlib-resources and python-mypy-extensions. Remove python-lockfile, python-rdflib-jsonld and python-typing-extensions. Replace python-mistune with python-mistune-next. [arguments]: Use G-expressions. Set exact version number. Skip more tests that require network access. Change-Id: I4de4704f58f40fdf9bf4c02e41c2c353beaa3eb2 --- gnu/packages/bioinformatics.scm | 61 ++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 84577ef760..75cfad51a6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5001,37 +5001,52 @@ (define-public python-pyfasta (define-public python-schema-salad (package (name "python-schema-salad") - (version "8.2.20211116214159") + (version "8.5.20240102191335") (source - (origin - (method url-fetch) - (uri (pypi-uri "schema-salad" version)) - (sha256 - (base32 - "005dh2y45x92zl8sf2sqjmfvcqr4hrz8dfckgkckv87003v7lwqc")))) + (origin + (method url-fetch) + (uri (pypi-uri "schema-salad" version)) + (sha256 + (base32 + "035202p696i3jylb8b3nm9qcxsqby15hhqn1dl4nrz73a17p0ckx")))) (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'skip-failing-tests - (lambda _ - ;; Skip tests that require network access. - (substitute* "schema_salad/tests/test_cwl11.py" - (("^def test_(secondaryFiles|outputBinding)" all) - (string-append "@pytest.mark.skip(reason=" - "\"test requires network access\")\n" - all)))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + ;; Set exact version. + (substitute* "setup.py" + (("use_scm_version=True") + (string-append "version=\"" #$version "\""))))) + (add-before 'check 'skip-failing-tests + (lambda _ + ;; Skip tests that require network access. + (let ((skip-test + (lambda (test-pattern) + (string-append "@pytest.mark.skip(reason=" + "\"test requires network access\")\n" + test-pattern)))) + (substitute* "schema_salad/tests/test_cg.py" + (("^def test_(load(_by_yaml_metaschema|_metaschema|_cwlschema|)|include|idmap|idmap2)\\(" all) + (skip-test all))) + (substitute* "schema_salad/tests/test_cwl11.py" + (("^def test_(secondaryFiles|outputBinding|yaml_tab_error)\\(" all) + (skip-test all))) + (substitute* "schema_salad/tests/test_examples.py" + (("^def test_bad_schemas\\(" all) + (skip-test all))))))))) (propagated-inputs (list python-cachecontrol - python-lockfile - python-mistune + python-importlib-resources + python-mistune-next + python-mypy-extensions python-rdflib - python-rdflib-jsonld python-requests - python-ruamel.yaml - python-typing-extensions)) + python-ruamel.yaml)) (native-inputs - (list python-black python-pytest python-pytest-runner)) + (list python-black python-pytest python-pytest-runner python-pytest-xdist)) (home-page "https://github.com/common-workflow-language/schema_salad") (synopsis "Schema Annotations for Linked Avro Data (SALAD)") (description -- 2.41.0