From a87aa49fbf1a4c9c3d2e5a645e0d630e59ceb4b3 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Fri, 26 Feb 2021 19:17:37 -0600 Subject: petsc/petsc4py/slepc: switch default git branch from 'master' to 'main' (#22001) --- var/spack/repos/builtin/packages/petsc/package.py | 14 +++++++------- var/spack/repos/builtin/packages/pflotran/package.py | 2 +- var/spack/repos/builtin/packages/py-libensemble/package.py | 2 +- var/spack/repos/builtin/packages/py-petsc4py/package.py | 10 +++++----- var/spack/repos/builtin/packages/slepc/package.py | 4 ++-- var/spack/repos/builtin/packages/xsdk/package.py | 8 ++++---- var/spack/repos/builtin/packages/xsdktrilinos/package.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index af6b518d03..09c4e097a6 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -16,7 +16,7 @@ class Petsc(Package): git = "https://gitlab.com/petsc/petsc.git" maintainers = ['balay', 'barrysmith', 'jedbrown'] - version('develop', branch='master') + version('main', branch='main') version('xsdk-0.2.0', tag='xsdk-0.2.0') version('3.14.4', sha256='b030969816e02c251a6d010c07a90b69ade44932f9ddfac3090ff5e95ab97d5c') @@ -176,7 +176,7 @@ class Petsc(Package): # Virtual dependencies # Git repository needs sowing to build Fortran interface - depends_on('sowing', when='@develop') + depends_on('sowing', when='@main') depends_on('sowing@1.1.23-p1', when='@xsdk-0.2.0') # PETSc, hypre, superlu_dist when built with int64 use 32 bit integers @@ -226,8 +226,8 @@ class Petsc(Package): depends_on('hypre@2.14:+mpi~internal-superlu+int64', when='@3.14:+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu+int64', when='@xsdk-0.2.0+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu~int64', when='@xsdk-0.2.0+hypre+mpi~complex~int64') - depends_on('hypre@develop+mpi~internal-superlu+int64', when='@develop+hypre+mpi~complex+int64') - depends_on('hypre@develop+mpi~internal-superlu~int64', when='@develop+hypre+mpi~complex~int64') + depends_on('hypre@develop+mpi~internal-superlu+int64', when='@main+hypre+mpi~complex+int64') + depends_on('hypre@develop+mpi~internal-superlu~int64', when='@main+hypre+mpi~complex~int64') depends_on('superlu-dist@:4.3~int64', when='@3.4.4:3.6.4+superlu-dist+mpi~int64') depends_on('superlu-dist@:4.3+int64', when='@3.4.4:3.6.4+superlu-dist+mpi+int64') depends_on('superlu-dist@5.0.0:5.1.3~int64', when='@3.7:3.7.99+superlu-dist+mpi~int64') @@ -242,13 +242,13 @@ class Petsc(Package): depends_on('superlu-dist@6.1:+int64', when='@3.13.0:+superlu-dist+mpi+int64') depends_on('superlu-dist@xsdk-0.2.0~int64', when='@xsdk-0.2.0+superlu-dist+mpi~int64') depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64') - depends_on('superlu-dist@develop~int64', when='@develop+superlu-dist+mpi~int64') - depends_on('superlu-dist@develop+int64', when='@develop+superlu-dist+mpi+int64') + depends_on('superlu-dist@develop~int64', when='@main+superlu-dist+mpi~int64') + depends_on('superlu-dist@develop+int64', when='@main+superlu-dist+mpi+int64') depends_on('mumps+mpi~int64', when='+mumps') depends_on('scalapack', when='+mumps') depends_on('trilinos@12.6.2:+mpi', when='@3.7.0:+trilinos+mpi') depends_on('trilinos@xsdk-0.2.0+mpi', when='@xsdk-0.2.0+trilinos+mpi') - depends_on('trilinos@develop+mpi', when='@xdevelop+trilinos+mpi') + depends_on('trilinos@develop+mpi', when='@main+trilinos+mpi') depends_on('mkl', when='+mkl-pardiso') depends_on('fftw+mpi', when='+fftw+mpi') depends_on('suite-sparse', when='+suite-sparse') diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index ed1d37da31..a51299d441 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -26,7 +26,7 @@ class Pflotran(AutotoolsPackage): depends_on('mpi') depends_on('hdf5@1.8.12:+mpi+fortran+hl') - depends_on('petsc@develop:+hdf5+metis', when='@develop') + depends_on('petsc@main:+hdf5+metis', when='@develop') depends_on('petsc@3.14:+hdf5+metis', when='@xsdk-0.6.0') depends_on('petsc@3.12:+hdf5+metis', when='@xsdk-0.5.0') depends_on('petsc@3.10:+hdf5+metis', when='@xsdk-0.4.0') diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index 2aed33b4c8..ff673611a2 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -46,7 +46,7 @@ class PyLibensemble(PythonPackage): depends_on('py-mpi4py@2.0:', type=('build', 'run'), when='+mpi') depends_on('py-scipy', type=('build', 'run'), when='+scipy') depends_on('py-petsc4py', type=('build', 'run'), when='+petsc4py') - depends_on('py-petsc4py@develop', type=('build', 'run'), when='@develop+petsc4py') + depends_on('py-petsc4py@main', type=('build', 'run'), when='@develop+petsc4py') depends_on('nlopt', type=('build', 'run'), when='+nlopt') depends_on('py-mpmath', type=('build', 'run'), when='+mpmath') depends_on('py-deap', type=('build', 'run'), when='+deap') diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index ba25eebf12..b0bbea23d5 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -16,7 +16,7 @@ class PyPetsc4py(PythonPackage): maintainers = ['dalcinl', 'balay'] - version('develop', branch='master') + version('main', branch='main') version('3.14.1', sha256='f5f8daf3a4cd1dfc945876b0d83a05b25f3c54e08046312eaa3e3036b24139c0') version('3.14.0', sha256='33ac9fb55a541e4c1deabd6e2144da96d5ae70e70c830a55de558000cf3f0ec5') version('3.13.0', sha256='0e11679353c0c2938336a3c8d1a439b853e20d3bccd7d614ad1dbea3ec5cb31f') @@ -33,9 +33,9 @@ class PyPetsc4py(PythonPackage): variant('mpi', default=True, description='Activates MPI support') patch('ldshared.patch', when='@:99') - patch('ldshared-dev.patch', when='@develop') + patch('ldshared-dev.patch', when='@main') - depends_on('py-cython', type='build', when='@develop') + depends_on('py-cython', type='build', when='@main') 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')) @@ -43,7 +43,7 @@ class PyPetsc4py(PythonPackage): depends_on('petsc+mpi', when='+mpi') depends_on('petsc~mpi', when='~mpi') - depends_on('petsc@develop', when='@develop') + depends_on('petsc@main', when='@main') depends_on('petsc@3.14.2:3.14.99', when='@3.14.1:3.14.99') depends_on('petsc@3.14.0:3.14.1', when='@3.14.0') depends_on('petsc@3.13:3.13.99', when='@3.13:3.13.99') @@ -59,7 +59,7 @@ class PyPetsc4py(PythonPackage): @property def build_directory(self): import os - if self.spec.satisfies('@develop'): + if self.spec.satisfies('@main'): return os.path.join(self.stage.source_path, 'src', 'binding', 'petsc4py') else: return self.stage.source_path diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index b5c3b5e31f..6ab7cbdda2 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -17,7 +17,7 @@ class Slepc(Package): maintainers = ['joseeroman', 'balay'] - version('master', branch='master') + version('main', branch='main') version('3.14.2', sha256='3e54578dda1f4c54d35ac27d02f70a43f6837906cb7604dbcec0e033cfb264c8') version('3.14.1', sha256='cc78a15e34d26b3e6dde003d4a30064e595225f6185c1975bbd460cb5edd99c7') version('3.14.0', sha256='37f8bb270169d1d3f5d43756ac8929d56204e596bd7a78a7daff707513472e46') @@ -54,7 +54,7 @@ class Slepc(Package): depends_on('python@2.6:2.8,3.4:', type='build', when='@3.11:') # Cannot mix release and development versions of SLEPc and PETSc: - depends_on('petsc@develop', when='@master') + depends_on('petsc@main', when='@main') depends_on('petsc@3.14:3.14.99', when='@3.14:3.14.99') depends_on('petsc@3.13:3.13.99', when='@3.13:3.13.99') depends_on('petsc@3.12:3.12.99', when='@3.12:3.12.99') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 0bfc1bc7a4..728ea53583 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -81,7 +81,7 @@ class Xsdk(BundlePackage): depends_on('petsc +trilinos', when='+trilinos') depends_on('petsc +cuda', when='+cuda @0.6.0:') depends_on('petsc +batch', when='platform=cray @0.5.0:') - depends_on('petsc@develop+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', + depends_on('petsc@main+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@develop') depends_on('petsc@3.14.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@0.6.0') @@ -143,7 +143,7 @@ class Xsdk(BundlePackage): depends_on('amrex@18.10.1', when='@0.4.0 %intel') depends_on('amrex@18.10.1', when='@0.4.0 %gcc') - depends_on('slepc@master', when='@develop') + depends_on('slepc@main', when='@develop') depends_on('slepc@3.14.0', when='@0.6.0') depends_on('slepc@3.12.0', when='@0.5.0') depends_on('slepc@3.10.1', when='@0.4.0') @@ -177,7 +177,7 @@ class Xsdk(BundlePackage): depends_on('tasmanian@6.0+xsdkflags+blas+cuda+magma~openmp', when='@0.4.0 +cuda') # the Fortran 2003 bindings of phist require python@3:, but this - # creates a conflict with other packages like petsc@develop. Actually + # creates a conflict with other packages like petsc@main. Actually # these are type='build' dependencies, but spack reports a conflict anyway. # This will be fixed once the new concretizer becomes available # (says @adamjstewart) @@ -197,7 +197,7 @@ class Xsdk(BundlePackage): depends_on('ginkgo@1.1.0 ~openmp+cuda', when='@0.5.0 +cuda +ginkgo') depends_on('py-libensemble@develop+petsc4py', type='run', when='@develop +libensemble') - depends_on('py-petsc4py@develop', type='run', when='@develop +libensemble') + depends_on('py-petsc4py@main', type='run', when='@develop +libensemble') depends_on('py-libensemble@0.7.1+petsc4py', type='run', when='@0.6.0 +libensemble') depends_on('py-petsc4py@3.14.0', type='run', when='@0.6.0 +libensemble') depends_on('py-libensemble@0.5.2+petsc4py', type='run', when='@0.5.0 +libensemble') diff --git a/var/spack/repos/builtin/packages/xsdktrilinos/package.py b/var/spack/repos/builtin/packages/xsdktrilinos/package.py index c1290a6616..75b570d213 100644 --- a/var/spack/repos/builtin/packages/xsdktrilinos/package.py +++ b/var/spack/repos/builtin/packages/xsdktrilinos/package.py @@ -31,7 +31,7 @@ class Xsdktrilinos(CMakePackage): depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre') depends_on('hypre@develop~internal-superlu', when='@develop+hypre') depends_on('petsc@xsdk-0.2.0+mpi~complex', when='@xsdk-0.2.0+petsc') - depends_on('petsc@develop+mpi~complex', when='@develop+petsc') + depends_on('petsc@main+mpi~complex', when='@develop+petsc') depends_on('trilinos@12.6.4', when='@12.6.4') depends_on('trilinos@12.8.1', when='@12.8.1') depends_on('trilinos@xsdk-0.2.0', when='@xsdk-0.2.0') -- cgit v1.2.3-70-g09d2