[eccodes] 11/106: WIP: move to python3; enable tests

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository eccodes.

commit 81a65d6e30a24c4d210c7b2a6469ab9a4c0f66db
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 15 18:19:12 2016 +0000

    WIP: move to python3; enable tests
---
 debian/control                                 |  2 +-
 debian/rules                                   | 13 ++++++++++---
 definitions/grib2/local/1098/template.2.0.def~ | 19 -------------------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/control b/debian/control
index dbb7b86..ad94244 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Uploaders: Enrico Zini <enrico at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, cmake,
   libjpeg-dev, libpng-dev, gfortran, flex, bison, quilt,
-  curl, python-all-dev, python-numpy, dh-python,
+  curl, python3-all-dev, python3-numpy, dh-python,
   libopenjpeg-dev, libboost-dev, libhdf5-dev,
   libaec-dev
 Standards-Version: 3.9.7.0
diff --git a/debian/rules b/debian/rules
index aedd2b5..3d987ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,15 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 export LDFLAGS
 
+# Don't test on mips. will time out most of the time on low-powered archs
+DO_TEST:=true
+ARCH:=$(shell dpkg --print-architecture)
+ifeq ($(ARCH), mips)
+DO_TEST:=false
+endif
+
 %:
-	dh $@ --buildsystem=cmake --with=python2
+	dh $@ --buildsystem=cmake --with=python3
 
 override_dh_auto_configure:
 	# Disable python modules until we figure out how to build them properly
@@ -28,7 +35,7 @@ override_dh_auto_configure:
 override_dh_install:
 	for d in libeccodes_f90.so	libeccodes.so ; do \
 		cp $(LIBDIR)/$$d $(LIBDIR)/$$d.0.0.0 ; done
-	dh_numpy
+	dh_numpy3
 	dh_install
 
 override_dh_auto_clean:
@@ -45,4 +52,4 @@ override_dh_fixperms:
 	test -e /usr/bin/dh_buildinfo && dh_buildinfo
 
 override_dh_auto_test:
-	@echo Ignore tests.
+	$(DO_TEST) && ( LD_LIBRARY_PATH=$(CURDIR)/debian/build/lib dh_auto_test  )
diff --git a/definitions/grib2/local/1098/template.2.0.def~ b/definitions/grib2/local/1098/template.2.0.def~
deleted file mode 100644
index b878176..0000000
--- a/definitions/grib2/local/1098/template.2.0.def~
+++ /dev/null
@@ -1,19 +0,0 @@
-codetable[2] tiggeModel 'grib2/local/[localSubSectionCentre:l]/models.table';
-codetable[2] tiggeCentre 'grib2/local/[localSubSectionCentre:l]/centres.table';
-concept tiggeLAMName {
-  "MOGREPS-MO- EUA" = {tiggeCentre=0;tiggeModel=0;}
-  "AEMet-SREPS-MM-EUAT"= {tiggeCentre=1;tiggeModel=1;}
-  "SRNWP-PEPS"= {tiggeCentre=1;tiggeModel=2;}
-  "COSMOLEPS-ARPASIMC-EU"= {tiggeCentre=2;tiggeModel=3;}
-  "NORLAMEPS" = {tiggeCentre=3;tiggeModel=4;}
-  "ALADIN-LAEF" = {tiggeCentre=4;tiggeModel=5;}
-  "COSMO-DE EPS" = {tiggeCentre=5;tiggeModel=6;}
-  "COSMO-SREPS-BO-EU" = {tiggeCentre=6;tiggeModel=7;}
-  "GLAMEPS" = {tiggeCentre=7;tiggeModel=8;}
-  "PEARCE" = {tiggeCentre=8;tiggeModel=9;}
-  "DMI- HIRLAM" = {tiggeCentre=9;tiggeModel=10;}
-  "OMSZ- ALADIN-EPS" = {tiggeCentre=10;tiggeModel=11;}
-  "OMSZ- ALADIN-EPS" = {tiggeCentre=11;tiggeModel=11;}
-  "OMSZ- ALADIN-EPS" = {tiggeCentre=12;tiggeModel=11;}
-}
-

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