From: Arun Isaac <arunisaac@systemreboot.net>
To: 66690@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>,
Arun Isaac <arunisaac@systemreboot.net>
Subject: [bug#66690] [PATCH 7/7] gnu: cwltool: Update to 3.1.20230601100705.
Date: Mon, 23 Oct 2023 09:09:46 +0100 [thread overview]
Message-ID: <eaa84b956d6a4468adfc8d5325ba44b28e4f170e.1698013055.git.arunisaac@systemreboot.net> (raw)
In-Reply-To: <cover.1698013055.git.arunisaac@systemreboot.net>
* gnu/packages/bioinformatics.scm (cwltool): Update to 3.1.20230601100705.
[arguments]: Use G-expressions. Set version in setup.py. Do not attempt to
substitute files cwltool/schemas/v1.1/tests/env-tool1.cwl,
cwltool/schemas/v1.1/tests/env-tool2.cwl and
cwltool/schemas/v1.1/tests/imported-hint.cwl that have been removed in this
release.
[inputs]: Add python-cwl-utils.
---
gnu/packages/bioinformatics.scm | 88 ++++++++++++++++-----------------
1 file changed, 43 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 2deec5368e..b4ac896a0d 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4583,7 +4583,7 @@ (define-public python-cwl-utils
(define-public cwltool
(package
(name "cwltool")
- (version "3.1.20220119140128")
+ (version "3.1.20231020140205")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4592,56 +4592,54 @@ (define-public cwltool
(file-name (git-file-name name version))
(sha256
(base32
- "1jmrm0qrqgka79avc1kq63fgh20gx6g07fc8p3iih4k85vhdyl3f"))))
+ "045n594k7zhm5qnf7mippldmm43wj3x0wnizhhpd1n2ak2iiky88"))))
(build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'loosen-version-restrictions
- (lambda _
- (substitute* "setup.py"
- (("== 1.5.1") ">=1.5.1")))) ; prov
- (add-after 'unpack 'dont-use-git
- (lambda _
- (substitute* "gittaggers.py"
- (("self.git_timestamp_tag\\(\\)")
- (string-append "time.strftime('.%Y%m%d%H%M%S', time.gmtime(int("
- (string-drop ,version 4) ")))")))))
- (add-after 'unpack 'modify-tests
- (lambda _
- ;; Tries to connect to the internet.
- (delete-file "tests/test_content_type.py")
- (delete-file "tests/test_udocker.py")
- (delete-file "tests/test_http_input.py")
- (substitute* "tests/test_load_tool.py"
- (("def test_load_graph_fragment_from_packed")
- (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
- "def test_load_graph_fragment_from_packed")))
- (substitute* "tests/test_examples.py"
- (("def test_env_filtering")
- (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
- "def test_env_filtering")))
- ;; Tries to use cwl-runners.
- (substitute* "tests/test_examples.py"
- (("def test_v1_0_arg_empty_prefix_separate_false")
- (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
- "def test_v1_0_arg_empty_prefix_separate_false")))
-
- (substitute* '("cwltool/schemas/v1.1/tests/env-tool1.cwl"
- "cwltool/schemas/v1.1/tests/env-tool2.cwl"
- "cwltool/schemas/v1.1/tests/imported-hint.cwl"
- "tests/subgraph/env-tool2.cwl"
- "tests/subgraph/env-tool2_req.cwl"
- "tests/subgraph/env-wf2_subwf-packed.cwl"
- "tests/subgraph/env-tool2_no_env.cwl")
- (("\"/bin/sh\"") (string-append "\"" (which "sh") "\"")))
- ;; Pytest doesn't know what to do with "-n auto"
- (substitute* "tox.ini"
- (("-n auto") "")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'loosen-version-restrictions
+ (lambda _
+ (substitute* "setup.py"
+ (("== 1.5.1") "> 1.5.1")))) ; prov
+ (add-after 'unpack 'set-version
+ (lambda _
+ ;; Set exact version.
+ (substitute* "setup.py"
+ (("use_scm_version=True")
+ (string-append "version=\"" #$version "\"")))))
+ (add-after 'unpack 'modify-tests
+ (lambda _
+ ;; Tries to connect to the internet.
+ (delete-file "tests/test_content_type.py")
+ (delete-file "tests/test_udocker.py")
+ (delete-file "tests/test_http_input.py")
+ (substitute* "tests/test_load_tool.py"
+ (("def test_load_graph_fragment_from_packed")
+ (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
+ "def test_load_graph_fragment_from_packed")))
+ (substitute* "tests/test_examples.py"
+ (("def test_env_filtering")
+ (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
+ "def test_env_filtering")))
+ ;; Tries to use cwl-runners.
+ (substitute* "tests/test_examples.py"
+ (("def test_v1_0_arg_empty_prefix_separate_false")
+ (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
+ "def test_v1_0_arg_empty_prefix_separate_false")))
+ (substitute* '("tests/subgraph/env-tool2.cwl"
+ "tests/subgraph/env-tool2_req.cwl"
+ "tests/subgraph/env-wf2_subwf-packed.cwl"
+ "tests/subgraph/env-tool2_no_env.cwl")
+ (("\"/bin/sh\"") (string-append "\"" (which "sh") "\"")))
+ ;; Pytest doesn't know what to do with "-n auto"
+ (substitute* "tox.ini"
+ (("-n auto") "")))))))
(inputs
(list python-argcomplete
python-bagit
python-coloredlogs
+ python-cwl-utils
python-mypy-extensions
python-prov
python-pydot
--
2.41.0
next prev parent reply other threads:[~2023-10-23 8:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-22 22:27 [bug#66690] [PATCH 0/7] Upgrade cwltool Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 1/7] gnu: python-ruamel.yaml.clib: Update to 0.2.7 Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 2/7] gnu: python-ruamel.yaml: Update to 0.17.40 Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 3/7] gnu: python-schema-salad: Update to 8.4.20230927144413 Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 4/7] gnu: Add python-cwlformat Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 5/7] gnu: Add python-cwl-upgrader Arun Isaac
2023-10-23 8:09 ` [bug#66690] [PATCH 6/7] gnu: Add python-cwl-utils Arun Isaac
2023-10-23 8:09 ` Arun Isaac [this message]
2023-11-22 14:37 ` [bug#66690] [PATCH 0/7] Upgrade cwltool Ludovic Courtès
2023-11-23 0:35 ` Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 0/8] " Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 1/8] gnu: python-ruamel.yaml.clib: Update to 0.2.8 Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 2/8] gnu: python-ruamel-yaml: Update to 0.18.6 Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 3/8] gnu: python-schema-salad: Update to 8.5.20240102191335 Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 4/8] gnu: Add python-cwlformat Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 5/8] gnu: Add python-cwl-upgrader Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 6/8] gnu: Add python-cwl-utils Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 7/8] gnu: Add python-spython Arun Isaac
2024-02-15 20:46 ` [bug#66690] [PATCH v2 8/8] gnu: cwltool: Update to 3.1.20240112164112 Arun Isaac
2024-02-18 22:39 ` [bug#66690] [PATCH v2 0/8] Upgrade cwltool Ludovic Courtès
2024-02-22 13:16 ` bug#66690: " Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eaa84b956d6a4468adfc8d5325ba44b28e4f170e.1698013055.git.arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=66690@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).