From f64cb29aea77d32605a8c7109a0aecb0a82c6377 Mon Sep 17 00:00:00 2001 From: Marco De La Pierre Date: Thu, 15 Dec 2022 02:44:22 +0800 Subject: Nextflow, Tower Agent, Tower CLI: updates (#34515) * renamed tower-agent and tower-cli with prefif nf- * new nextflow package version * added newest versions (today) for nf-tower-agent and nf-tower-cli --- .../repos/builtin/packages/nextflow/package.py | 12 ++- .../builtin/packages/nf-tower-agent/package.py | 44 +++++++++++ .../repos/builtin/packages/nf-tower-cli/package.py | 87 ++++++++++++++++++++++ .../repos/builtin/packages/tower-agent/package.py | 2 + .../repos/builtin/packages/tower-cli/package.py | 6 ++ 5 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/nf-tower-agent/package.py create mode 100644 var/spack/repos/builtin/packages/nf-tower-cli/package.py diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index 04b2e84ae6..1c2a239f7c 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -12,8 +12,18 @@ class Nextflow(Package): homepage = "https://www.nextflow.io" url = "https://github.com/nextflow-io/nextflow/releases/download/v21.04.3/nextflow" - maintainers = ["dialvarezs"] + maintainers = ["dialvarezs", "marcodelapierre"] + version( + "22.10.4", + sha256="612a085e183546688e0733ebf342fb73865f560ad1315d999354048fbca5954d", + expand=False, + ) + version( + "22.10.3", + sha256="8d67046ca3b645fab2642d90848550a425c9905fd7dfc2b4753b8bcaccaa70dd", + expand=False, + ) version( "22.10.1", sha256="fa6b6faa8b213860212da413e77141a56a5e128662d21ea6603aeb9717817c4c", diff --git a/var/spack/repos/builtin/packages/nf-tower-agent/package.py b/var/spack/repos/builtin/packages/nf-tower-agent/package.py new file mode 100644 index 0000000000..82bfe3764e --- /dev/null +++ b/var/spack/repos/builtin/packages/nf-tower-agent/package.py @@ -0,0 +1,44 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import platform + +from spack.package import * + + +class NfTowerAgent(Package): + """Tower Agent allows Nextflow Tower to launch pipelines + on HPC clusters that do not allow direct access through + an SSH client. + """ + + homepage = "https://github.com/seqeralabs/tower-agent" + maintainers = ["marcodelapierre"] + + if platform.machine() == "x86_64": + if platform.system() == "Linux": + version( + "0.5.0", + sha256="887f85aa9bb4688839c04b40887ce6446822ada7bdd858ec105cf44641ec8d2d", + url="https://github.com/seqeralabs/tower-agent/releases/download/v0.5.0/tw-agent-linux-x86_64", + expand=False, + ) + version( + "0.4.5", + sha256="d3f38931ff769299b9f9f7e78d9f6a55f93914878c09117b8eaf5decd0c734ec", + url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.5/tw-agent-linux-x86_64", + expand=False, + ) + version( + "0.4.3", + sha256="1125e64d4e3342e77fcf7f6827f045e421084654fe8faafd5389e356e0613cc0", + url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.3/tw-agent-linux-x86_64", + expand=False, + ) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install(self.stage.archive_file, join_path(prefix.bin, "tw-agent")) + set_executable(join_path(prefix.bin, "tw-agent")) diff --git a/var/spack/repos/builtin/packages/nf-tower-cli/package.py b/var/spack/repos/builtin/packages/nf-tower-cli/package.py new file mode 100644 index 0000000000..824fad23d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/nf-tower-cli/package.py @@ -0,0 +1,87 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import platform + +from spack.package import * + + +class NfTowerCli(Package): + """Tower on the Command Line brings Nextflow Tower concepts + including Pipelines, Actions and Compute Environments + to the terminal. + """ + + homepage = "https://github.com/seqeralabs/tower-cli" + maintainers = ["marcodelapierre"] + + if platform.machine() == "x86_64": + if platform.system() == "Darwin": + version( + "0.7.2", + sha256="b72093af9c8d61e0150eb9d56cedb67afc982d2432221ae0819aaa0c8826ff2b", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.2/tw-0.7.2-osx-x86_64", + expand=False, + ) + version( + "0.7.1", + sha256="a4731d0d7f2c2d4219758126a8ee0b22a0a68464329d4be0a025ad7eb191e5c0", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.1/tw-0.7.1-osx-x86_64", + expand=False, + ) + version( + "0.7.0", + sha256="b1b3ade4231de2c7303832bac406510c9de171d07d6384a54945903f5123f772", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-osx-x86_64", + expand=False, + ) + version( + "0.6.5", + sha256="8e7369611f3617bad3e76264d93fe467c6039c86af9f18e26142dee5df1e7346", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-osx-x86_64", + expand=False, + ) + version( + "0.6.2", + sha256="2bcc17687d58d4c888e8d57b7f2f769a2940afb3266dc3c6c48b0af0cb490d91", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-osx-x86_64", + expand=False, + ) + elif platform.system() == "Linux": + version( + "0.7.2", + sha256="a66d1655d2f3d83db160a890e6b3f20f4573978aa9e8ea5d6e505958a2980e72", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.2/tw-0.7.2-linux-x86_64", + expand=False, + ) + version( + "0.7.1", + sha256="f3f8cf6b241f8935d4d90bd271809ca4cd7157ac476822483f458edbe54a1fa8", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.1/tw-0.7.1-linux-x86_64", + expand=False, + ) + version( + "0.7.0", + sha256="651f564b80585c9060639f1a8fc82966f81becb0ab3e3ba34e53baf3baabff39", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-linux-x86_64", + expand=False, + ) + version( + "0.6.5", + sha256="0d1f3a6f53694000c1764bd3b40ce141f4b8923d477e2bdfdce75c66de95be00", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-linux-x86_64", + expand=False, + ) + version( + "0.6.2", + sha256="02c6d141416b046b6e8b6f9723331fe0e39d37faa3561c47c152df4d33b37e50", + url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-linux-x86_64", + expand=False, + ) + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install(self.stage.archive_file, join_path(prefix.bin, "tw")) + set_executable(join_path(prefix.bin, "tw")) diff --git a/var/spack/repos/builtin/packages/tower-agent/package.py b/var/spack/repos/builtin/packages/tower-agent/package.py index e4ec5103cc..9f7eb51f73 100644 --- a/var/spack/repos/builtin/packages/tower-agent/package.py +++ b/var/spack/repos/builtin/packages/tower-agent/package.py @@ -22,12 +22,14 @@ class TowerAgent(Package): version( "0.4.5", sha256="d3f38931ff769299b9f9f7e78d9f6a55f93914878c09117b8eaf5decd0c734ec", + deprecated=True, url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.5/tw-agent-linux-x86_64", expand=False, ) version( "0.4.3", sha256="1125e64d4e3342e77fcf7f6827f045e421084654fe8faafd5389e356e0613cc0", + deprecated=True, url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.3/tw-agent-linux-x86_64", expand=False, ) diff --git a/var/spack/repos/builtin/packages/tower-cli/package.py b/var/spack/repos/builtin/packages/tower-cli/package.py index ed878fe7b4..020c0fce8f 100644 --- a/var/spack/repos/builtin/packages/tower-cli/package.py +++ b/var/spack/repos/builtin/packages/tower-cli/package.py @@ -22,18 +22,21 @@ class TowerCli(Package): version( "0.7.0", sha256="b1b3ade4231de2c7303832bac406510c9de171d07d6384a54945903f5123f772", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-osx-x86_64", expand=False, ) version( "0.6.5", sha256="8e7369611f3617bad3e76264d93fe467c6039c86af9f18e26142dee5df1e7346", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-osx-x86_64", expand=False, ) version( "0.6.2", sha256="2bcc17687d58d4c888e8d57b7f2f769a2940afb3266dc3c6c48b0af0cb490d91", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-osx-x86_64", expand=False, ) @@ -41,18 +44,21 @@ class TowerCli(Package): version( "0.7.0", sha256="651f564b80585c9060639f1a8fc82966f81becb0ab3e3ba34e53baf3baabff39", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-linux-x86_64", expand=False, ) version( "0.6.5", sha256="0d1f3a6f53694000c1764bd3b40ce141f4b8923d477e2bdfdce75c66de95be00", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-linux-x86_64", expand=False, ) version( "0.6.2", sha256="02c6d141416b046b6e8b6f9723331fe0e39d37faa3561c47c152df4d33b37e50", + deprecated=True, url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-linux-x86_64", expand=False, ) -- cgit v1.2.3-60-g2f50