zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to kim-api-2.1.1 and openkim-models-2019-07-25 (#12137)

Browse Source 
* update to kim-api-2.1.1 and openkim-models-2019-07-25

* openkim-models provide needed dependency constraints and settings

* add maintainers and fixup flake8 errors
This commit is contained in:
Ryan S. Elliott
2019-07-26 13:06:10 -05:00
committed by Adam J. Stewart
parent fbb04ece43
commit 12055acccc
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/kim-api/package.py
View File

@@ -24,9 +24,12 @@ class KimApi(CMakePackage):
""" """
extendable = True extendable = True
homepage = "https://openkim.org/" homepage = "https://openkim.org/"
url = "https://s3.openkim.org/kim-api/kim-api-2.1.0.txz" url = "https://s3.openkim.org/kim-api/kim-api-2.1.1.txz"
git = "https://github.com/openkim/kim-api.git" git = "https://github.com/openkim/kim-api.git"
maintainers = ['ellio167']
version('develop', branch='devel') version('develop', branch='devel')
version('2.1.1', sha256="25c4e83c6caa83a1c4ad480b430f1926fb44813b64f548fdaedc45e310b5f6b9")
version('2.1.0', sha256="d6b154b31b288ec0a5643db176950ed71f1ca83a146af210a1d5d01cce8ce958") version('2.1.0', sha256="d6b154b31b288ec0a5643db176950ed71f1ca83a146af210a1d5d01cce8ce958")
version('2.0.2', sha256="26e7cf91066692f316b8ba1548ccb7152bf56aad75902bce2338cff53e74e63d") version('2.0.2', sha256="26e7cf91066692f316b8ba1548ccb7152bf56aad75902bce2338cff53e74e63d")

28
var/spack/repos/builtin/packages/openkim-models/package.py
View File

@@ -19,19 +19,33 @@ class OpenkimModels(CMakePackage):
compatible with the kim-api package. compatible with the kim-api package.
""" """
homepage = "https://openkim.org/" homepage = "https://openkim.org/"
url = "https://s3.openkim.org/archives/collection/openkim-models-2019-03-29.txz" url = "https://s3.openkim.org/archives/collection/openkim-models-2019-07-25.txz"
maintainers = ['ellio167']
extends('kim-api') extends('kim-api')
depends_on('kim-api@2.1.0:', when='@2019-07-25:')
depends_on('kim-api@:2.0.2', when='@:2019-03-29')
version('2019-03-29', sha256='053dda2023fe4bb6d7c1d66530c758c4e633bbf1f1be17b6b075b276fe8874f6') version(
'2019-07-25',
sha256='50338084ece92ec0fb13b0bbdf357b5d7450e26068ba501f23c315f814befc26')
version(
'2019-03-29',
sha256='053dda2023fe4bb6d7c1d66530c758c4e633bbf1f1be17b6b075b276fe8874f6')
def cmake_args(self): def cmake_args(self):
args = [] args = []
args.append(('-DKIM_API_MODEL_DRIVER_INSTALL_PREFIX={0}' args.append(('-DKIM_API_MODEL_DRIVER_INSTALL_PREFIX={0}'
+ '/lib/kim-api/model-drivers').format(prefix)) + '/lib/kim-api/model-drivers').format(prefix))
args.append('-DKIM_API_MODEL_INSTALL_PREFIX={0}/lib/kim-api/models'
.format(prefix)) if self.spec.satisfies('@2019-07-25:'):
args.append('-DKIM_API_SIMULATOR_MODEL_INSTALL_PREFIX={0}/lib/' args.append(('-DKIM_API_PORTABLE_MODEL_INSTALL_PREFIX={0}'
'kim-api/simulator-models' + '/lib/kim-api/portable-models').format(prefix))
.format(prefix)) else:
args.append(('-DKIM_API_MODEL_INSTALL_PREFIX={0}'
+ '/lib/kim-api/models').format(prefix))
args.append(('-DKIM_API_SIMULATOR_MODEL_INSTALL_PREFIX={0}'
+ '/lib/kim-api/simulator-models').format(prefix))
return args return args