diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 6b42aa70c9..66e0b5a363 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -14,12 +14,13 @@ class PyEspressopp(CMakePackage): atomistic or bead-spring models as they are used in soft matter research """ homepage = "https://espressopp.github.io" - url = "https://github.com/espressopp/espressopp/tarball/v2.0.2" + url = "https://github.com/espressopp/espressopp/tarball/v3.0.0" git = "https://github.com/espressopp/espressopp.git" - version('develop', branch='master') - version('2.0.2', sha256='8cf4525bca06426379f5b9fbb8cc2603f559d28a2e74d1d7694df963b8f3dc6c') - version('1.9.5', sha256='8093f1a226f9fee8fb37c401767439a29ff3656dede3a44b4160169fc90d4d91') + version('master', branch='master') + version('3.0.0', sha256='63518e768a98179ad5ef3be96eabaa4d38063b34962e2278db7d59ed2bb8a32e') + version('2.0.2', sha256='8cf4525bca06426379f5b9fbb8cc2603f559d28a2e74d1d7694df963b8f3dc6c', deprecated=True) + version('1.9.5', sha256='8093f1a226f9fee8fb37c401767439a29ff3656dede3a44b4160169fc90d4d91', deprecated=True) variant('ug', default=False, description='Build user guide') variant('pdf', default=False, description='Build user guide in pdf format') @@ -27,15 +28,16 @@ class PyEspressopp(CMakePackage): depends_on("cmake@2.8:", type='build') depends_on("mpi") - depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11", when='@1.9.4:') + depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11") extends("python") - depends_on("python@2:2.8") - depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run')) - depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type=('build', 'run')) + depends_on("python@2:2.8", when="@:2.9999", type=('build', 'run')) + depends_on("python@3:", type=('build', 'run')) + depends_on("py-mpi4py@2.0.0:", type=('build', 'run')) depends_on("fftw") depends_on("py-sphinx", when="+ug", type='build') depends_on("py-sphinx", when="+pdf", type='build') - depends_on('py-numpy@:1.16.6', type=('build', 'run')) + depends_on('py-numpy@:1.16.6', when='@:2.9999', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run')) depends_on('py-matplotlib', when="+ug", type='build') depends_on('py-matplotlib', when="+pdf", type='build') depends_on("texlive", when="+pdf", type='build')