From 3eda19a5e8796543fae0fcbeee6ba20e84c73629 Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Wed, 10 Jun 2020 07:34:50 +0000 Subject: [PATCH] dune-grod-glue now has a 2.7 release --- packages/dune/package.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/dune/package.py b/packages/dune/package.py index cd0f08c..ede9d95 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -242,14 +242,13 @@ class Dune(CMakePackage): when='@%s+pdelab' % _vers, ) - # The dune-grid-glue package does not yet have a 2.7-compatible release - resource( - name='dune-grid-glue', - git='https://gitlab.dune-project.org/extensions/dune-grid-glue.git', - branch='master', - when='@master+gridglue', - ) - conflicts('dune@2.7', when='+gridglue') + # The dune-grid-glue package does not yet have a 2.7-compatible release + resource( + name='dune-grid-glue', + git='https://gitlab.dune-project.org/extensions/dune-grid-glue.git', + branch=_branch, + when='@%s+gridglue' % _vers, + ) # The dune-python package migrated to dune-common after the 2.7 release resource(