From 20b16e2364daa379a6466c16722d78642fc275d4 Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Sun, 5 Oct 2025 11:52:35 +0200 Subject: [PATCH] gnu: python-schema-salad: Update to 8.9.20250723145140. * gnu/packages/bioinformatics.scm (python-schema-salad): Update to 8.9.20250723145140. [source] : Switch to git-fetch. [arguments] <#:test-flags>: Temporarily disable failing test. <#:phases>: Update 'set-version phase. Add 'relax-requirements phase. Update 'skip-failing-tests phase. [native-inputs]: Remove python-mypy, python-pytest-runner, python-types-dataclasses, python-types-requests, python-types-setuptools, and python-wheel; add python-pytest-xdist. Change-Id: I1e5b2b73fb0efaa2e9c2054f949423e04b056c9d Signed-off-by: Sharlatan Hellseher --- gnu/packages/bioinformatics.scm | 45 ++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cab61ef45aa3a95a10d5ee061f519bfea3a4cf7e..b62f250b8c1703bc59d280adcfeba882ebc25325 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6857,37 +6857,47 @@ accessing bigWig files.") (define-public python-schema-salad (package (name "python-schema-salad") - (version "8.8.20241206093842") + (version "8.9.20250723145140") (source (origin - (method url-fetch) - (uri (pypi-uri "schema_salad" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/common-workflow-language/schema_salad") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "13vx3lqivfzsh1qdvx89vxnn25l3ssmzyh06g74psl4kmf9pj51a")))) + "1bqsbxx1275129j08aqz7qpzk1nlk4h9psvkm7hzb4liag8nyiql")))) (build-system pyproject-build-system) (arguments (list + #:test-flags + #~(list + ;; Skip failing test, probably innocent. + ;; TODO: Remove when upgrading because updated upstream. + "--deselect=schema_salad/tests/test_makedoc.py::test_detect_changes_in_html") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'set-version + (add-before 'build 'set-version (lambda _ - ;; Set exact version. + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))) + (add-after 'unpack 'relax-requirements + (lambda _ + ;; Mistune dependency is too strict mistune>=3,<3.1 . + ;; TODO: Remove when upgrading, because updated upstream. + (substitute* "requirements.txt" + (("mistune.*") "mistune")) (substitute* "setup.py" - (("use_scm_version=True") - (string-append "version=\"" #$version "\""))))) + (("mistune[^\"]*") "mistune")))) (add-before 'check 'skip-failing-tests (lambda _ - (substitute* "tox.ini" - (("^addopts=.*") "")) - ;; 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) + (("^def test_load_by_yaml_metaschema\\(" all) (skip-test all))) (substitute* "schema_salad/tests/test_cwl11.py" (("^def test_(secondaryFiles|outputBinding|yaml_tab_error)\\(" all) @@ -6903,17 +6913,12 @@ accessing bigWig files.") python-requests python-ruamel.yaml)) (native-inputs - (list python-black + (list python-black ;black is actually used in the tests. python-cachecontrol - python-mypy python-pytest - python-pytest-runner + python-pytest-xdist ;because tests are ran with "-n auto" in tox.ini python-setuptools - python-setuptools-scm - python-types-dataclasses - python-types-requests - python-types-setuptools - python-wheel)) + python-setuptools-scm)) (home-page "https://github.com/common-workflow-language/schema_salad") (synopsis "Schema Annotations for Linked Avro Data (SALAD)") (description