summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Huebl <axel.huebl@plasma.ninja>2021-01-04 07:29:46 -0800
committerGitHub <noreply@github.com>2021-01-04 16:29:46 +0100
commita3fb8e55d586f6ac16a1a64675e3ffab315a98e9 (patch)
tree5a89e928b4f9ef42b0333543100051111507446c
parenta5611e0466a0a5ea811950535c247d2d56476b0e (diff)
downloadspack-a3fb8e55d586f6ac16a1a64675e3ffab315a98e9.tar.gz
spack-a3fb8e55d586f6ac16a1a64675e3ffab315a98e9.tar.bz2
spack-a3fb8e55d586f6ac16a1a64675e3ffab315a98e9.tar.xz
spack-a3fb8e55d586f6ac16a1a64675e3ffab315a98e9.zip
openPMD-api: 0.13.0 (#20648)
Add the latest release of openPMD-api. Remove a selection of unsupported, pre-beta releases.
-rw-r--r--var/spack/repos/builtin/packages/openpmd-api/package.py28
1 files changed, 12 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py
index 86ccccdf3f..91b0914c4f 100644
--- a/var/spack/repos/builtin/packages/openpmd-api/package.py
+++ b/var/spack/repos/builtin/packages/openpmd-api/package.py
@@ -15,13 +15,9 @@ class OpenpmdApi(CMakePackage):
maintainers = ['ax3l']
version('dev', branch='dev')
- version('0.12.0', tag='0.12.0-alpha')
+ version('0.13.0', tag='0.13.0') # C++14 required
+ version('0.12.0', tag='0.12.0-alpha') # C++11 up until here
version('0.11.1', tag='0.11.1-alpha')
- version('0.11.0', tag='0.11.0-alpha')
- version('0.10.3', tag='0.10.3-alpha')
- version('0.10.2', tag='0.10.2-alpha')
- version('0.10.1', tag='0.10.1-alpha')
- version('0.10.0', tag='0.10.0-alpha')
variant('shared', default=True,
description='Build a shared version of the library')
@@ -36,7 +32,7 @@ class OpenpmdApi(CMakePackage):
variant('python', default=False,
description='Enable Python bindings')
- depends_on('cmake@3.12.0:', type='build')
+ depends_on('cmake@3.15.0:', type='build')
depends_on('mpark-variant@1.4.0:')
depends_on('catch2@2.6.1:', type='test')
depends_on('mpi@2.3:', when='+mpi') # might become MPI 3.0+
@@ -50,18 +46,14 @@ class OpenpmdApi(CMakePackage):
depends_on('adios2@2.6.0:', when='+adios2 @0.12.0:')
depends_on('adios2@2.5.0: ~mpi', when='~mpi +adios2')
depends_on('adios2@2.5.0: +mpi', when='+mpi +adios2')
- depends_on('nlohmann-json@3.7.0:')
- depends_on('py-pybind11@2.3.0:', when='+python', type='link')
+ depends_on('nlohmann-json@3.9.1:')
+ depends_on('py-pybind11@2.6.1:', when='+python', type='link')
depends_on('py-numpy@1.15.1:', when='+python', type=['test', 'run'])
depends_on('py-mpi4py@2.1.0:', when='+python +mpi', type=['test', 'run'])
- depends_on('python@3.5:', when='+python', type=['link', 'test', 'run'])
+ depends_on('python@3.6:', when='+python', type=['link', 'test', 'run'])
extends('python', when='+python')
- # Fix breaking HDF5 1.12.0 API
- # https://github.com/openPMD/openPMD-api/pull/696
- patch('hdf5-1.12.0.patch', when='@:0.11.0 +hdf5')
-
def cmake_args(self):
spec = self.spec
@@ -89,8 +81,12 @@ class OpenpmdApi(CMakePackage):
# switch internally shipped third-party libraries for spack
if spec.satisfies('+python'):
args.append('-DopenPMD_USE_INTERNAL_PYBIND11:BOOL=OFF')
- args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format(
- self.spec['python'].command.path))
+ if spec.version >= Version('0.13.0'):
+ args.append('-DPython_ROOT_DIR:FILEPATH={0}'.format(
+ self.spec['python'].prefix))
+ else:
+ args.append('-DPYTHON_EXECUTABLE:FILEPATH={0}'.format(
+ self.spec['python'].command.path))
args.extend([
'-DopenPMD_USE_INTERNAL_JSON:BOOL=OFF',