From bdd8472cb36ee1e4d1d359e5eb32d632cc23e742 Mon Sep 17 00:00:00 2001 From: Landon Owen Date: Wed, 15 May 2024 15:47:05 -0700 Subject: [PATCH] Brought py-ats recipe back to avoid having to bring in py-poetry, trying double quotes around spec --- scripts/devtools/tpl-manager.py | 2 +- scripts/spack/packages/py-ats/package.py | 30 +++++++++++++++++++++++ scripts/spack/packages/spheral/package.py | 4 +-- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 scripts/spack/packages/py-ats/package.py diff --git a/scripts/devtools/tpl-manager.py b/scripts/devtools/tpl-manager.py index e092741d6..699852eb8 100755 --- a/scripts/devtools/tpl-manager.py +++ b/scripts/devtools/tpl-manager.py @@ -184,7 +184,7 @@ def build_deps(args): sexe("{0} spec --fresh -IL {1}@develop%{2} 2>&1 | tee -a \"spec-info-{2}-out.txt\"".format(spack_cmd, package_name, s)) # Install only the dependencies for Spheral and create CMake configure file - sexe("{0} install --fail-fast --fresh -u initconfig '{1}@develop%{2} dev_path=./' 2>&1 | tee -a \"tpl-build-{2}-out.txt\"".format(spack_cmd, package_name, s)) + sexe("{0} install --fail-fast --fresh -u initconfig \"{1}@develop%{2} dev_path=./\" 2>&1 | tee -a \"tpl-build-{2}-out.txt\"".format(spack_cmd, package_name, s)) if not args.no_clean: sexe("rm -f spec-info-* tpl-build-* spack-build-* spack-configure-args.txt") diff --git a/scripts/spack/packages/py-ats/package.py b/scripts/spack/packages/py-ats/package.py new file mode 100644 index 000000000..3d69395a1 --- /dev/null +++ b/scripts/spack/packages/py-ats/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2021 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) + +from spack import * + + +class PyAts(PythonPackage): + """ATS - Automated Testing System - is an open-source, Python-based tool + for automating the running of tests of an application across a broad range + of high performance computers.""" + + homepage = "https://github.com/LLNL/ATS" + git = "https://github.com/LLNL/ATS.git" + + maintainers = ['white238'] + + version('main', branch='main') + version('exit', branch='bugfix/exit-code') + version('7.0.100', tag='7.0.100') + version('7.0.9', tag='7.0.9') + version('7.0.5', tag='7.0.5') + + # TODO: Add flux variant when Flux functionality works in ATS + + depends_on("python@3.8:", type=('build', 'run')) + depends_on("py-numpy", type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-poetry-core', type='build') diff --git a/scripts/spack/packages/spheral/package.py b/scripts/spack/packages/spheral/package.py index f014b85a7..903dedb09 100644 --- a/scripts/spack/packages/spheral/package.py +++ b/scripts/spack/packages/spheral/package.py @@ -34,7 +34,7 @@ class Spheral(CachedCMakePackage, CudaPackage): # DEPENDS # ------------------------------------------------------------------------- depends_on('mpi', when='+mpi') - depends_on('cmake@3.10.0:', type='build') + depends_on('cmake@3.18.0:', type='build') depends_on('boost@1.74.0 +system +filesystem -atomic -container -coroutine -chrono -context -date_time -exception -fiber -graph -iostreams -locale -log -math -mpi -program_options -python -random -regex -test -thread -timer -wave +pic', type='build') @@ -71,7 +71,7 @@ class Spheral(CachedCMakePackage, CudaPackage): depends_on('py-h5py', type='build') depends_on('py-docutils', type='build') depends_on('py-scipy', type='build') - depends_on('py-ats', type='build') + depends_on('py-ats@exit', type='build') depends_on('py-mpi4py', type='build', when='+mpi') depends_on('py-sphinx', type='build')