diff options
| author | snehring <7978778+snehring@users.noreply.github.com> | 2023-08-08 18:33:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 18:33:56 -0500 |
| commit | 99112ad2ad092fb57db582abc82ba0ad10299bf4 (patch) | |
| tree | 92ed387f8bfc16f28c398e24c1f4033e1131fd37 /var | |
| parent | 75c70c395d4a77899ffc6bb65991cfd6a77506cc (diff) | |
| download | spack-99112ad2ad092fb57db582abc82ba0ad10299bf4.tar.gz spack-99112ad2ad092fb57db582abc82ba0ad10299bf4.tar.bz2 spack-99112ad2ad092fb57db582abc82ba0ad10299bf4.tar.xz spack-99112ad2ad092fb57db582abc82ba0ad10299bf4.zip | |
Update py-gtdbtk to 2.3.2 (#39296)
* fastani: adding version 1.34 and changing build_system
* py-gtdbtk: adding version 2.3.2
* fastani: adding requested changes
* py-gtdbtk: adding requested changes
* fastani: remove conditional
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/fastani/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-gtdbtk/package.py | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/fastani/package.py b/var/spack/repos/builtin/packages/fastani/package.py index 1eacdf840a..24924a7c76 100644 --- a/var/spack/repos/builtin/packages/fastani/package.py +++ b/var/spack/repos/builtin/packages/fastani/package.py @@ -6,18 +6,23 @@ from spack.package import * -class Fastani(AutotoolsPackage): +class Fastani(CMakePackage, AutotoolsPackage): """Fast, alignment-free computation of whole-genome Average Nucleotide Identity (ANI)""" homepage = "https://github.com/ParBLiSS/FastANI" url = "https://github.com/ParBLiSS/FastANI/archive/v1.33.tar.gz" + maintainers("snehring") + version("1.34", sha256="dc185cf29b9fa40cdcc2c83bb48150db46835e49b9b64a3dbff8bc4d0f631cb1") version("1.33", sha256="0b18b3074094722fb1b2247c1a1c4eb96295fff369b837f422e05072740e0013") - depends_on("autoconf", type="build") + build_system(conditional("cmake", when="@1.34:"), "autotools", default="cmake") + + depends_on("autoconf", type="build", when="build_system=autotools") + depends_on("automake", type="build", when="build_system=autotools") + depends_on("cmake@3.20:", type="build", when="build_system=cmake") + depends_on("libtool", type="build", when="build_system=autotools") + depends_on("m4", type="build", when="build_system=autotools") depends_on("gsl", type=("build", "link")) depends_on("zlib", type=("build", "link")) - depends_on("automake", type="build") - depends_on("libtool", type="build") - depends_on("m4", type="build") diff --git a/var/spack/repos/builtin/packages/py-gtdbtk/package.py b/var/spack/repos/builtin/packages/py-gtdbtk/package.py index 6e5328a348..75b5171ffa 100644 --- a/var/spack/repos/builtin/packages/py-gtdbtk/package.py +++ b/var/spack/repos/builtin/packages/py-gtdbtk/package.py @@ -15,15 +15,15 @@ class PyGtdbtk(PythonPackage): homepage = "https://github.com/Ecogenomics/GTDBTk" pypi = "gtdbtk/gtdbtk-2.1.0.tar.gz" + version("2.3.2", sha256="80efd31e10007d835f56a3d6fdf039a59db3b6ba4be26b234692da5e688aa99f") version("2.3.0", sha256="4f237a03657be4540ac653c276fe31c002b6923af0411316719a9541d6e97d4b") version("2.1.0", sha256="980885141f13502afdf05e720871427e3de4fe27f4f3f97e74af6fed87eb50a7") - depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type=("build")) depends_on("py-dendropy@4.1.0:", type=("build", "run")) depends_on("py-numpy@1.9.0:", type=("build", "run")) depends_on("py-tqdm@4.35.0:", type=("build", "run")) - depends_on("py-pydantic", type=("build", "run"), when="@2.3.0:") + depends_on("py-pydantic@1.9.2:1", type=("build", "run"), when="@2.3.0:") depends_on("prodigal@2.6.2:", type=("build", "run")) depends_on("hmmer@3.1b2:", type=("build", "run")) depends_on("pplacer@1.1:", type=("build", "run")) |