From 7694364c69c53467a4375fc55fcfb7f408356bcf Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Fri, 10 Jul 2020 09:15:29 +0000 Subject: [PATCH] dune-codegen now has a 2.7 release --- packages/dune/package.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/dune/package.py b/packages/dune/package.py index 88cf343..266ddf8 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -266,16 +266,24 @@ class Dune(CMakePackage): when='@2.6+python', ) - # The dune-codegen package does not yet have a 2.7-compatible release + # The dune-codegen package does not have a 2.6-compatible release resource( name='dune-codegen', git='https://gitlab.dune-project.org/extensions/dune-codegen.git', - branch='bugfix/installed-library', + branch='master', when='@master+codegen', submodules=True, ) + + resource( + name='dune-codegen', + git='https://gitlab.dune-project.org/extensions/dune-codegen.git', + branch='releases/2.7', + when='@2.7+codegen', + submodules=True, + ) + conflicts('dune@2.6', when='+codegen') - conflicts('dune@2.7', when='+codegen') # Make sure that Python components integrate well into Spack extends('python')