From 4807a17bab758d92b3490e97337c8f6b1e6389ac Mon Sep 17 00:00:00 2001 From: Dominic Kempf Date: Fri, 5 Jun 2020 14:54:49 +0000 Subject: [PATCH] PDELab now has a releases/2.7 branch --- packages/dune/package.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/dune/package.py b/packages/dune/package.py index 5e5f344..cd0f08c 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -235,6 +235,13 @@ class Dune(CMakePackage): when='@%s+fem+python' % _vers, ) + resource( + name='dune-pdelab', + git='https://gitlab.dune-project.org/pdelab/dune-pdelab.git', + branch=_branch, + when='@%s+pdelab' % _vers, + ) + # The dune-grid-glue package does not yet have a 2.7-compatible release resource( name='dune-grid-glue', @@ -252,15 +259,6 @@ class Dune(CMakePackage): when='@2.7+python', ) - # The dune-pdelab package does not yet have a 2.7-compatible release - resource( - name='dune-pdelab', - git='https://gitlab.dune-project.org/pdelab/dune-pdelab.git', - branch='master', - when='@master+pdelab', - ) - conflicts('dune@2.7', when='+pdelab') - # The dune-codegen package does not yet have a 2.7-compatible release resource( name='dune-codegen',