diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2019-02-07 09:06:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-07 09:06:31 -0600 |
| commit | 1d71a5ea573cfdd2ad5dfb4c9969a23e142aed9f (patch) | |
| tree | 1568cede658dcf41bea17415730897ec9bcbeaa2 | |
| parent | 0ad1b2a2c8437d90a1853ce9855b13d654989a55 (diff) | |
| download | spack-1d71a5ea573cfdd2ad5dfb4c9969a23e142aed9f.tar.gz spack-1d71a5ea573cfdd2ad5dfb4c9969a23e142aed9f.tar.bz2 spack-1d71a5ea573cfdd2ad5dfb4c9969a23e142aed9f.tar.xz spack-1d71a5ea573cfdd2ad5dfb4c9969a23e142aed9f.zip | |
petsc4py and libensemble: add @develop dependencies (#10539)
* py-petsc4py: add @develop
* py-libensemble: add @develop dependency on py-petsc4py@develop
| -rw-r--r-- | var/spack/repos/builtin/packages/py-libensemble/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-petsc4py/package.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index dd36de0dab..0f41195686 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -26,4 +26,5 @@ class PyLibensemble(PythonPackage): depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) depends_on('py-petsc4py@3.5:', type=('build', 'run')) + depends_on('py-petsc4py@develop', type=('build', 'run'), when='@develop') depends_on('nlopt', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 5bed1f408a..101baf0ce3 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -14,6 +14,7 @@ class PyPetsc4py(PythonPackage): url = "https://bitbucket.org/petsc/petsc4py/get/3.10.0.tar.gz" git = "https://bitbucket.org/petsc/petsc4py.git" + version('develop', branch='master') version('3.10.1', sha256='4eae5eaf459875b1329cae36fa1e5e185f603e8b01a4e05b59b0983c02b5a174') version('3.10.0', sha256='737e7812ccc54b1e0d6e8de4bdcd886c8ce287129297831f1f0e33089fa352f2') version('3.9.1', sha256='9bad0bab69a19bbceb201b9203708104a0bbe0ee19c0fa839b6ea6aa55dc238c') @@ -22,12 +23,14 @@ class PyPetsc4py(PythonPackage): version('3.8.0', sha256='b9b728e39245213cd8e74cf4724be9bb48bd295f99634135e37dbbdbec275244') version('3.7.0', sha256='fb78b50c596c3ba6a097751dd9a379e7acaf57edd36311a3afa94caa4312ee08') + depends_on('py-cython', type='build', when='@develop') depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) depends_on('py-mpi4py', type=('build', 'run')) depends_on('petsc+mpi') + depends_on('petsc@develop+mpi', when='@develop') depends_on('petsc@3.10.3:3.10.99+mpi', when='@3.10.1:3.10.99') depends_on('petsc@3.10:3.10.2+mpi', when='@3.10.0') depends_on('petsc@3.9:3.9.99+mpi', when='@3.9:3.9.99') |