From dac34147c017e35043f93c2be2959377b5a9a50e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 3 Oct 2019 09:48:42 -0500 Subject: [PATCH] Add EasyBuild 4.0.0 (#13024) * Add EasyBuild 4.0.0 * Update homepage, remove no longer required deps * Replace version ranges with fixed versions --- .../repos/builtin/packages/easybuild/package.py | 16 +++++++++++----- .../packages/py-easybuild-easyblocks/package.py | 12 +++++++++--- .../py-easybuild-easyconfigs/package.py | 14 ++++++++++---- .../packages/py-easybuild-framework/package.py | 17 +++++++++++------ 4 files changed, 41 insertions(+), 18 deletions(-) diff --git a/var/spack/repos/builtin/packages/easybuild/package.py b/var/spack/repos/builtin/packages/easybuild/package.py index 043481874b..0430639762 100644 --- a/var/spack/repos/builtin/packages/easybuild/package.py +++ b/var/spack/repos/builtin/packages/easybuild/package.py @@ -11,11 +11,17 @@ class Easybuild(PythonPackage): for (scientific) software on HPC systems. """ - homepage = 'http://hpcugent.github.io/easybuild/' - url = 'https://pypi.io/packages/source/e/easybuild/easybuild-3.1.2.tar.gz' + homepage = 'https://easybuilders.github.io/easybuild/' + url = 'https://pypi.io/packages/source/e/easybuild/easybuild-4.0.0.tar.gz' + maintainers = ['boegel'] + version('4.0.0', sha256='21bcc1048525ad6219667cc97a7421b5388068c670cabba356712e474896de40') version('3.1.2', 'c2d901c2a71f51b24890fa69c3a46383') - depends_on('py-easybuild-framework@3.1.2', when='@3.1.2', type='run') - depends_on('py-easybuild-easyblocks@3.1.2', when='@3.1.2', type='run') - depends_on('py-easybuild-easyconfigs@3.1.2', when='@3.1.2', type='run') + depends_on('python@2.6:2.8', when='@:3', type=('build', 'run')) + depends_on('python@2.6:2.8,3.5:', when='@4:', type=('build', 'run')) + + for v in ['@4.0.0', '@3.1.2']: + depends_on('py-easybuild-framework' + v, when=v, type='run') + depends_on('py-easybuild-easyblocks' + v, when=v, type='run') + depends_on('py-easybuild-easyconfigs' + v, when=v, type='run') diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py index 181a25febc..8719f6924f 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py @@ -11,9 +11,15 @@ class PyEasybuildEasyblocks(PythonPackage): installation framework for (scientific) software on HPC systems. """ - homepage = 'http://hpcugent.github.io/easybuild/' - url = 'https://pypi.io/packages/source/e/easybuild-easyblocks/easybuild-easyblocks-3.1.2.tar.gz' + homepage = 'https://easybuilders.github.io/easybuild' + url = 'https://pypi.io/packages/source/e/easybuild-easyblocks/easybuild-easyblocks-4.0.0.tar.gz' + maintainers = ['boegel'] + version('4.0.0', sha256='a0fdef6c33c786e323bde1b28bab942fd8e535c26842877d705e692e85b31b07') version('3.1.2', 'be08da30c07e67ed3e136e8d38905fbc') - depends_on('py-easybuild-framework@3.1:', when='@3.1:', type='run') + depends_on('python@2.6:2.8', when='@:3', type=('build', 'run')) + depends_on('python@2.6:2.8,3.5:', when='@4:', type=('build', 'run')) + + for v in ['@3.1.2', '@4.0.0']: + depends_on('py-easybuild-framework' + v, when=v, type='run') diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py index 9f9d69c2cb..cc610917ff 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py @@ -11,10 +11,16 @@ class PyEasybuildEasyconfigs(PythonPackage): installation framework for (scientific) software on HPC systems. """ - homepage = 'http://hpcugent.github.io/easybuild/' - url = 'https://pypi.io/packages/source/e/easybuild-easyconfigs/easybuild-easyconfigs-3.1.2.tar.gz' + homepage = 'https://easybuilders.github.io/easybuild' + url = 'https://pypi.io/packages/source/e/easybuild-easyconfigs/easybuild-easyconfigs-4.0.0.tar.gz' + maintainers = ['boegel'] + version('4.0.0', sha256='90d4e8f8abb11e7ae2265745bbd1241cd69d02570e9b4530175c4b2e2aba754e') version('3.1.2', '13a4a97fe8a5b9a94f885661cf497d13') - depends_on('py-easybuild-framework@3.1:', when='@3.1:', type='run') - depends_on('py-easybuild-easyblocks@3.1.2:', when='@3.1.2', type='run') + depends_on('python@2.6:2.8', when='@:3', type=('build', 'run')) + depends_on('python@2.6:2.8,3.5:', when='@4:', type=('build', 'run')) + + for v in ['@3.1.2', '@4.0.0']: + depends_on('py-easybuild-framework{0}:'.format(v), when=v + ':', type='run') + depends_on('py-easybuild-easyblocks{0}:'.format(v), when=v, type='run') diff --git a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py index feb31e680b..47e78c51d1 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py @@ -11,12 +11,17 @@ class PyEasybuildFramework(PythonPackage): for (scientific) software on HPC systems. """ - homepage = 'http://hpcugent.github.io/easybuild/' - url = 'https://pypi.io/packages/source/e/easybuild-framework/easybuild-framework-3.1.2.tar.gz' + homepage = 'https://easybuilders.github.io/easybuild' + url = 'https://pypi.io/packages/source/e/easybuild-framework/easybuild-framework-4.0.0.tar.gz' + maintainers = ['boegel'] + version('4.0.0', sha256='f5c40345cc8b9b5750f53263ade6c9c3a8cd3dfab488d58f76ac61a8ca7c5a77') version('3.1.2', '283bc5f6bdcb90016b32986d52fd04a8') - depends_on('python@2.6:2.8', type='run') - depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-vsc-base@2.5.4:', when='@2.9:', type='run') - depends_on('py-vsc-install', type='run') # only required for tests (python -O -m test.framework.suite) + depends_on('python@2.6:2.8', when='@:3', type=('build', 'run')) + depends_on('python@2.6:2.8,3.5:', when='@4:', type=('build', 'run')) + depends_on('py-setuptools', when='@:3', type=('build', 'run')) + depends_on('py-vsc-base@2.5.4:', when='@2.9:3', type='run') + + # Only required for tests (python -O -m test.framework.suite) + depends_on('py-vsc-install', when='@:3', type='test')