[mshr] 02/04: Provide python3 support in python3-mshr
Drew Parsons
dparsons at moszumanska.debian.org
Tue Dec 12 07:55:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository mshr.
commit 65e0c850e74d98defc037eb310341293ab585215
Author: Drew Parsons <dparsons at debian.org>
Date: Tue Dec 12 15:07:16 2017 +0800
Provide python3 support in python3-mshr
---
debian/changelog | 1 +
debian/control | 33 +++++++++++++++++++++++++++------
debian/python-mshr.install | 2 +-
debian/python3-mshr.install | 1 +
debian/rules | 18 ++++++++++++------
5 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35d9e76..d95b3b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mshr (2017.1.0-2) UNRELEASED; urgency=medium
* Standards-Version: 4.1.2
+ * Provide python3 support in python3-mshr
-- Drew Parsons <dparsons at debian.org> Tue, 12 Dec 2017 14:56:09 +0800
diff --git a/debian/control b/debian/control
index da53f96..d9b459a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Johannes Ring <johannr at simula.no>
Build-Depends: debhelper (>= 10),
- python-dev,
+ python-dev, python3-dev,
dh-python,
cmake (>= 2.8.0),
swig3.0 (>= 3.0.3),
@@ -12,10 +12,13 @@ Build-Depends: debhelper (>= 10),
libgmp-dev,
libdolfin-dev (>= 2017.1.0),
python-ffc (>= 2017.1.0),
+ python3-ffc (>= 2017.1.0),
python-numpy,
+ python3-numpy,
libproj-dev
Standards-Version: 4.1.2
X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.4
Homepage: http://fenicsproject.org
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/fenics/mshr.git/
Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fenics/mshr.git/
@@ -39,7 +42,7 @@ Depends: libmshr2017.1 (= ${binary:Version}),
python-ffc (>= 2017.1.0),
cmake (>= 2.8.0),
libproj-dev,
- ${shlibs:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Description: Shared links and header files for mshr
mshr generates simplicial DOLFIN meshes in 2D and 3D from geometries
@@ -59,20 +62,38 @@ Depends: libmshr-dev (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Description: Python interface for mshr
+Description: Python 2 interface for mshr
mshr generates simplicial DOLFIN meshes in 2D and 3D from geometries
described by Constructive Solid Geometry (CSG) or from surface files,
utilizing CGAL and Tetgen as mesh generation backends.
.
- This package contains the Python interface for DOLFIN.
+ This package contains the Python 2 interface for mshr.
+
+Package: python3-mshr
+Section: python
+Architecture: any
+Depends: libmshr-dev (= ${binary:Version}),
+ libmshr2017.1 (= ${binary:Version}),
+ python3-dolfin (>= 2017.1.0),
+ dolfin-bin (>= 2017.1.0),
+ ${swig:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Python 3 interface for mshr
+ mshr generates simplicial DOLFIN meshes in 2D and 3D from geometries
+ described by Constructive Solid Geometry (CSG) or from surface files,
+ utilizing CGAL and Tetgen as mesh generation backends.
+ .
+ This package contains the Python 3 interface for mshr.
Package: mshr-demos
Section: doc
Architecture: all
Depends: libmshr-dev (>= ${source:Version}),
- python-mshr (>= ${source:Version}),
+ python3-mshr (>= ${source:Version}) | python-mshr (>= ${source:Version}),
libdolfin-dev (>= 2017.1.0),
- python-dolfin (>= 2017.1.0),
+ python3-dolfin (>= 2017.1.0) | python-dolfin (>= 2017.1.0),
${shlibs:Depends},
${misc:Depends}
Description: Examples and demo programs for mshr
diff --git a/debian/python-mshr.install b/debian/python-mshr.install
index e3da3e7..6a53a3b 100644
--- a/debian/python-mshr.install
+++ b/debian/python-mshr.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/*
+usr/lib/python2*/*-packages/*
diff --git a/debian/python3-mshr.install b/debian/python3-mshr.install
new file mode 100644
index 0000000..7aadc9c
--- /dev/null
+++ b/debian/python3-mshr.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/*
diff --git a/debian/rules b/debian/rules
index 80b7481..432be82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,9 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
BUILDDIR = $(CURDIR)/debian/build
MSHR_HOME = $(CURDIR)/$(DEB_SRCDIR)
USCAN_DESTDIR := $(CURDIR)
-PYVERS := $(shell pyversions --requested debian/control | tac -s' ')
-DEFAULT_PYVER := $(shell pyversions -d)
+PY2VERS := $(shell pyversions --requested debian/control | tac -s' ')
+PY3VERS := $(shell py3versions --requested debian/control | tac -s' ')
+PYVERS = $(PY3VERS) $(PY2VERS)
CMAKE_OPTS := \
-D CMAKE_BUILD_TYPE:STRING=Release \
@@ -40,9 +41,8 @@ else
endif
%:
- dh $@ --buildsystem=cmake \
- --builddirectory=$(BUILDDIR)-$(DEFAULT_PYVER) \
- --with python2
+ dh $@ --buildsystem=cmake --parallel \
+ --with python2,python3
override_dh_auto_clean:
for v in $(PYVERS); do \
@@ -70,12 +70,18 @@ override_dh_auto_install:
done
dh_numpy
+override_dh_auto_test:
+ for v in $(PYVERS); do \
+ dh_auto_test --builddirectory=$(BUILDDIR)-$$v; \
+ done
+
override_dh_gencontrol:
# We have a tight dependency on swig - #675207
set -e; \
swig_version=$$(dpkg-query -W swig3.0 | cut -f 2 | cut -d- -f 1); \
next_swig_version="$${swig_version%.*}.$$(($${swig_version##*.} + 1))"; \
- echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python-mshr.substvars
+ echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python-mshr.substvars; \
+ echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python3-mshr.substvars
dh_gencontrol
#override_dh_shlibdeps:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/mshr.git
More information about the debian-science-commits
mailing list