FEniCS: Force all modules to python 3.6 as dolfin requires it

outpaddling · Feb 14, 2018 · 86fb909 · 86fb909
1 parent e2e6936
commit 86fb909
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/dolfin/Makefile b/dolfin/Makefile
@@ -20,6 +20,6 @@ BUILD_DEPENDS=	eigen>0:math/eigen3 \
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libboost_math_c99.so:devel/boost-libs
 
-USES=		cmake:outsource pkgconfig python
+USES=		cmake:outsource pkgconfig python:3.6+
 
 .include <bsd.port.mk>
diff --git a/py-dijitso/Makefile b/py-dijitso/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module for distributed just-in-time shared library building
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/py-ffc/Makefile b/py-ffc/Makefile
@@ -13,7 +13,10 @@ COMMENT=	Compiler for finite element variational forms
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ufl>0:wip/py-ufl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fiat>0:wip/py-fiat@${FLAVOR}
+
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/py-fiat/Makefile b/py-fiat/Makefile
@@ -12,8 +12,8 @@ COMMENT=	FInite element Automatic Tabulator
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+# BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR}
+# RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist

diff --git a/py-instant/Makefile b/py-instant/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL3
 
 RUN_DEPENDS=	swig3.0:devel/swig30
 
-USES=			python
+USES=			python:3.6+
 USE_PYTHON=		autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/py-ufl/Makefile b/py-ufl/Makefile
@@ -12,7 +12,9 @@ COMMENT=	Unified Form Language for finite element discretizations
 
 LICENSE=	LGPL3
 
-USES=		python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+
+USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>