diff --git a/var/spack/repos/builtin/packages/aml/package.py b/var/spack/repos/builtin/packages/aml/package.py index 4c54cc40b03..922d24a36f0 100644 --- a/var/spack/repos/builtin/packages/aml/package.py +++ b/var/spack/repos/builtin/packages/aml/package.py @@ -11,7 +11,10 @@ class Aml(AutotoolsPackage): homepage = "https://xgitlab.cels.anl.gov/argo/aml" url = "https://www.mcs.anl.gov/research/projects/argo/downloads/aml-0.1.0.tar.gz" + git = "https://xgitlab.cels.anl.gov/argo/aml.git" version('0.1.0', sha256='cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b') + version('develop', branch='staging') + version('master', branch='master') depends_on('numactl') diff --git a/var/spack/repos/builtin/packages/casacore/package.py b/var/spack/repos/builtin/packages/casacore/package.py index 8ba7c9a80cf..24bb8defb46 100644 --- a/var/spack/repos/builtin/packages/casacore/package.py +++ b/var/spack/repos/builtin/packages/casacore/package.py @@ -12,26 +12,41 @@ class Casacore(CMakePackage): homepage = "https://github.com/casacore/casacore" url = "https://github.com/casacore/casacore/archive/v2.4.1.tar.gz" + maintainers = ['mpokorny'] + + version('3.2.0', sha256='ae5d3786cb6dfdd7ebc5eecc0c724ff02bbf6929720bc23be43a027978e79a5f') + version('3.1.2', sha256='ac94f4246412eb45d503f1019cabe2bb04e3861e1f3254b832d9b1164ea5f281') + version('3.1.1', sha256='85d2b17d856592fb206b17e0a344a29330650a4269c80b87f8abb3eaf3dadad4') + version('3.1.0', sha256='a6adf2d77ad0d6f32995b1e297fd88d31ded9c3e0bb8f28966d7b35a969f7897') + version('3.0.0', sha256='6f0e68fd77b5c96299f7583a03a53a90980ec347bff9dfb4c0abb0e2933e6bcb') version('2.4.1', sha256='58eccc875053b2c6fe44fe53b6463030ef169597ec29926936f18d27b5087d63') variant('openmp', default=False, description='Build OpenMP support') variant('shared', default=True, description='Build shared libraries') - variant('sofa', default=False, description='Build SOFA support') + # see note below about the reason for disabling the "sofa" variant + # variant('sofa', default=False, description='Build SOFA support') variant('fftw', default=False, description='Build FFTW3 support') variant('hdf5', default=False, description='Build HDF5 support') variant('python', default=False, description='Build python support') - variant('ncurses', default=False, description='Build ncurses support') depends_on('flex', type='build') depends_on('bison', type='build') depends_on('blas') depends_on('lapack') depends_on('cfitsio@3.181:') - depends_on('wcslib@4.20:') + depends_on('wcslib@4.20:+cfitsio') depends_on('fftw~mpi@3.0.0:', when='+fftw') - depends_on('sofa-c', when='+sofa') + # SOFA dependency suffers the same problem in CMakeLists.txt as readline; + # however, as SOFA is far less likely to be present on most systems, and as + # it's an unneeded dependency except for testing, for now we leave out the + # option for a dependency on SOFA. + # depends_on('sofa-c', when='+sofa') depends_on('hdf5', when='+hdf5') - depends_on('ncurses', when='+ncurses') + # Force dependency on readline. Although the presence of readline is tested + # in CMakeLists.txt, and casacore can be built without it, there's no way + # to control that dependency at build time; since many systems come with + # readline, it's better to explicitly depend on it here always. + depends_on('readline') depends_on('python@2.6:', when='+python') depends_on('boost+python', when='+python') depends_on('py-numpy', when='+python') diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 1f94009753f..aac0c4c60ba 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -75,6 +75,8 @@ class Openmpi(AutotoolsPackage): list_url = "http://www.open-mpi.org/software/ompi/" git = "https://github.com/open-mpi/ompi.git" + maintainers = ['hppritcha'] + version('develop', branch='master') # Current @@ -427,6 +429,10 @@ def configure_args(self): if spec.satisfies('@3.0.0:', strict=True): config_args.append('--with-zlib={0}'.format(spec['zlib'].prefix)) + if spec.satisfies('@4.0.0:4.0.2'): + # uct btl doesn't work with some UCX versions so just disable + config_args.append('--enable-mca-no-build=btl-uct') + # some scientific packages ignore deprecated/remove symbols. Re-enable # them for now, for discussion see # https://github.com/open-mpi/ompi/issues/6114#issuecomment-446279495 diff --git a/var/spack/repos/builtin/packages/py-spdlog/package.py b/var/spack/repos/builtin/packages/py-spdlog/package.py new file mode 100644 index 00000000000..2e149b6b309 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-spdlog/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2020 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 PySpdlog(PythonPackage): + """The py-spdlog package provides a Python wrapper + to the C++ spdlog library.""" + + homepage = 'https://github.com/bodgergely/spdlog-python' + url = 'https://pypi.io/packages/source/s/spdlog/spdlog-2.0.0.tar.gz' + git = 'https://github.com/bodgergely/spdlog-python.git' + + # NOTE: Righ now py-spdlog works with a git submodule containing a copy + # of spdlog. Ideally we would want to install spdlog ourselves and make + # this package depend on it. There is an issue for that on the py-spdlog + # github repository: https://github.com/bodgergely/spdlog-python/issues/19 + + version('master', branch='master', submodules=True) + version('2.0.0', sha256='b8d3732839850da414a47e91547ee1246f0690cb83f43f11a1fbaec40b7b968c') + + depends_on('py-pybind11@2.2:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-pytest-runner', type='build') + depends_on('py-pytest', type='test')