[ufl] 01/01: Enable Python 3 and testing

Johannes Ring johannr-guest at moszumanska.debian.org
Thu Jan 19 13:38:44 UTC 2017 

This is an automated email from the git hooks/post-receive script.

johannr-guest pushed a commit to branch master
in repository ufl.

commit a6cd8973f7de28b4fbe3c565919b91ad8efd2e10
Author: Johannes Ring <johannr at simula.no>
Date:   Thu Jan 19 14:38:35 2017 +0100

    Enable Python 3 and testing
---
 debian/changelog          |  7 ++++++
 debian/control            | 63 ++++++++++++++++++++++++++++++++++++++---------
 debian/python-ufl.install |  3 ---
 debian/rules              | 31 ++++++++++++++---------
 4 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89c526a..98fc0d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ufl (2016.2.0-2) UNRELEASED; urgency=medium
+
+  * Support Python 3.
+  * Enable testing.
+
+ -- Johannes Ring <johannr at simula.no>  Wed, 21 Dec 2016 13:09:55 +0100
+
 ufl (2016.2.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ef33e8a..00d60a2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,35 +3,74 @@ Section: python
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Johannes Ring <johannr at simula.no>
-Build-Depends: debhelper (>= 9), python-all (>= 2.7), python-setuptools, dh-python
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all (>= 2.7),
+ python3-all (>= 3.4),
+ python-setuptools,
+ python3-setuptools,
+ python-numpy,
+ python3-numpy,
+ python-six,
+ python3-six,
+ python-pytest,
+ python3-pytest
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
 Homepage: http://fenicsproject.org
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/fenics/ufl.git
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fenics/ufl.git
 
 Package: python-ufl
 Architecture: all
-Depends: python-numpy, python-six, ${python:Depends}, ${misc:Depends}
+Depends:
+ python-numpy,
+ python-six,
+ ${python:Depends},
+ ${misc:Depends}
 Suggests: python-ufl-doc
-Description: unified language for form-compilers
- UFL (Unified Form Language) is a unified language for definition of 
- variational forms intended for finite element discretization. More precisely,
- it defines a fixed interface for choosing finite element spaces and defining
- expressions for weak forms in a notation close to mathematical notation. 
- The form compilers FFC and SyFi use UFL as their end-user interface, 
- producing UFC implementations as their output.
+Description: unified language for form-compilers (Python 2)
+ UFL (Unified Form Language) is a unified language for definition of
+ variational forms intended for finite element discretization. More
+ precisely, it defines a fixed interface for choosing finite element
+ spaces and defining expressions for weak forms in a notation close to
+ mathematical notation.  The form compilers FFC and SyFi use UFL as
+ their end-user interface, producing UFC implementations as their
+ output.
+ .
+ This package installs the library for Python 2.
+
+Package: python3-ufl
+Architecture: all
+Depends:
+ python3-numpy,
+ python3-six,
+ ${python3:Depends},
+ ${misc:Depends}
+Suggests: python-ufl-doc
+Description: unified language for form-compilers (Python 3)
+ UFL (Unified Form Language) is a unified language for definition of
+ variational forms intended for finite element discretization. More
+ precisely, it defines a fixed interface for choosing finite element
+ spaces and defining expressions for weak forms in a notation close to
+ mathematical notation.  The form compilers FFC and SyFi use UFL as
+ their end-user interface, producing UFC implementations as their
+ output.
+ .
+ This package installs the library for Python 3.
 
 Package: python-ufl-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Description: documentation and demos for UFL
- UFL (Unified Form Language) is a unified language for definition of 
+ UFL (Unified Form Language) is a unified language for definition of
  variational forms intended for finite element discretization. More precisely,
  it defines a fixed interface for choosing finite element spaces and defining
- expressions for weak forms in a notation close to mathematical notation. 
- The form compilers FFC and SyFi use UFL as their end-user interface, 
+ expressions for weak forms in a notation close to mathematical notation.
+ The form compilers FFC and SyFi use UFL as their end-user interface,
  producing UFC implementations as their output.
  .
  This package contains documentation and demos for UFL.
diff --git a/debian/python-ufl.install b/debian/python-ufl.install
deleted file mode 100644
index c3a5c87..0000000
--- a/debian/python-ufl.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/*
-usr/lib/python*/*-packages/*
-usr/share/man/*
diff --git a/debian/rules b/debian/rules
index 108607a..9440724 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,34 @@
 #!/usr/bin/make -f
 
+#export DH_VERBOSE=1
+export PYBUILD_NAME=ufl
+#export PYBUILD_DISABLE=test
+export PYBUILD_TEST_ARGS={dir}/test
+export PYBUILD_TEST_PYTEST=1
+
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 USCAN_DESTDIR := $(CURDIR)
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_clean:
+	dh_clean
+	rm -rf *.egg-info
 
 override_dh_compress:
-	dh_compress -X.py -X.pdf -X.ufl
+	dh_compress -X.py -X.ufl
 
 override_dh_auto_install:
 	dh_auto_install
-# hyphen is not allowed as minus sign in manpage
-	gzip -d $(DEB_DESTDIR)/usr/share/man/man1/ufl-analyse.1.gz
-	gzip -d $(DEB_DESTDIR)/usr/share/man/man1/ufl-convert.1.gz
-	sed -i 's/ufl-analyse --quiet=0 --write=1/ufl-analyse \\-\\-quiet=0 \\-\\-write=1/' \
-	  $(DEB_DESTDIR)/usr/share/man/man1/ufl-analyse.1
-	sed -i 's/ufl-convert -omydir -iyourdir -c -f -tpdf -s/ufl-convert \\-omydir \\-iyourdir \\-c \\-f \\-tpdf \\-s/' \
-	  $(DEB_DESTDIR)/usr/share/man/man1/ufl-convert.1
-	gzip -9 $(DEB_DESTDIR)/usr/share/man/man1/ufl-analyse.1
-	gzip -9 $(DEB_DESTDIR)/usr/share/man/man1/ufl-convert.1
+	mv debian/python3-ufl/usr/bin/ufl-analyse debian/python3-ufl/usr/bin/ufl-analyse-3
+	mv debian/python3-ufl/usr/bin/ufl-convert debian/python3-ufl/usr/bin/ufl-convert-3
+	mv debian/python3-ufl/usr/bin/ufl-version debian/python3-ufl/usr/bin/ufl-version-3
+	mv debian/python3-ufl/usr/bin/ufl2py debian/python3-ufl/usr/bin/ufl2py-3
+	mv debian/python3-ufl/usr/share/man/man1/ufl-analyse.1.gz debian/python3-ufl/usr/share/man/man1/ufl-analyse-3.1.gz
+	mv debian/python3-ufl/usr/share/man/man1/ufl-convert.1.gz debian/python3-ufl/usr/share/man/man1/ufl-convert-3.1.gz
+	mv debian/python3-ufl/usr/share/man/man1/ufl-version.1.gz debian/python3-ufl/usr/share/man/man1/ufl-version-3.1.gz
+	mv debian/python3-ufl/usr/share/man/man1/ufl2py.1.gz debian/python3-ufl/usr/share/man/man1/ufl2py-3.1.gz
 
 .PHONY: get-orig-source
 get-orig-source:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/ufl.git

More information about the debian-science-commits mailing list