[cmor] 158/190: Ok, enable all tests and pbuild to check
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 46fed471f40d8f95fd0c8ddf23b8c0e9b15b26a1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jun 15 06:43:22 2013 +0100
Ok, enable all tests and pbuild to check
---
debian/changelog | 2 +-
debian/patches/python3.patch | 321 ++++++++++++++++++++++---------------------
debian/rules | 5 +-
3 files changed, 169 insertions(+), 159 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2eaf4f7..44e9032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ cmor (2.8.3-1) unstable; urgency=low
* Standards-Version: 3.9.4
* Build-Conflict: on python packages. For correct testing.
- -- Alastair McKinstry <mckinstry at debian.org> Fri, 14 Jun 2012 11:57:20 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 15 Jun 2013 08:57:20 +0100
cmor (2.8.0-3) unstable; urgency=low
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index e69bffb..ff54df1 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: cmor-2.8.3/Lib/git2svn.py
===================================================================
---- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os,sys
@@ -33,14 +33,17 @@ Index: cmor-2.8.3/Lib/git2svn.py
os.popen(cmd).readlines()
Index: cmor-2.8.3/Lib/pywrapper.py
===================================================================
---- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py 2013-06-14 16:11:48.000000000 +0100
-@@ -1,4 +1,3 @@
+--- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py 2013-06-15 06:39:39.000000000 +0100
+@@ -1,5 +1,5 @@
-
- import cmor_const,numpy,os,_cmor
+-import cmor_const,numpy,os,_cmor
++from . import cmor_const,_cmor
++import numpy,os
try:
-@@ -37,25 +36,25 @@
+ import cdtime
+@@ -37,25 +37,25 @@
missing_value : scalar that is used to indicate missing data for this variable. It must be the same type as the data that will be passed to cmor_write. This missing_value will in general be replaced by a standard missing_value specified in the MIP table. If there are no missing data, and the user chooses not to declare the missing value, then this argument may be either omitted or assigned the value 'none' (i.e., missing_value='none').
"""
if not isinstance(table_entry,str):
@@ -72,7 +75,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
missing_value = float(missing_value)
return _cmor.time_varying_grid_coordinate(grid_id,table_entry,units,type,missing_value)
-@@ -68,7 +67,7 @@
+@@ -68,7 +68,7 @@
try:
vals = numpy.ascontiguousarray(vals.filled())
except:
@@ -81,7 +84,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
return vals
-@@ -92,32 +91,32 @@
+@@ -92,32 +92,32 @@
elif isinstance(axis_ids,(list,tuple)):
axis_ids = numpy.ascontiguousarray(axis_ids)
elif not isinstance(axis_ids, numpy.ndarray):
@@ -121,7 +124,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
type='f'
if nvertices is None :
-@@ -129,19 +128,19 @@
+@@ -129,19 +129,19 @@
latitude_vertices = _to_numpy(latitude_vertices, 'latitude_vertices')
if numpy.rank(latitude_vertices)!=len(axis_ids)+1:
@@ -145,7 +148,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
## print 'longitude_vert type:',longitude_vertices.dtype.char
if longitude_vertices.dtype.char!=type:
longitude_vertices = longitude_vertices.astype(type)
-@@ -149,10 +148,10 @@
+@@ -149,10 +149,10 @@
if latitude_vertices is None:
nvert = nvert2
elif nvert!=nvert2:
@@ -158,7 +161,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
## if area is not None:
-@@ -160,9 +159,9 @@
+@@ -160,9 +160,9 @@
## try:
## area = numpy.ascontiguousarray(area.filled())
## except:
@@ -170,18 +173,16 @@ Index: cmor-2.8.3/Lib/pywrapper.py
## if area.dtype.char!=type:
## area = area.astype(type)
n = len(axis_ids)
-@@ -181,27 +180,33 @@
+@@ -181,27 +181,31 @@
parameter_values :: array/list of parameter values in the same order of parameter_names (ignored if parameter_names is ditcionary)
parameter_units :: array/list of parameter units in the same order of parameter_names (ignored if parameter_names is ditcionary)
"""
- if not isinstance(grid_id,(numpy.int32,int,long)):
- raise Exception, "grid_id must be an integer: %s"%type(grid_id)
+ try:
-+ # Python2
+ if not isinstance(grid_id,(numpy.int32,int,long)):
+ raise Exception("grid_id must be an integer: %s"%type(grid_id))
+ except NameError:
-+ # Python3
+ if not isinstance(grid_id,(numpy.int32,int)):
+ raise Exception("grid_id must be an integer: %s"%type(grid_id))
if not isinstance(mapping_name,str):
@@ -211,7 +212,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
for v in val:
if isinstance(v,str):
punit.append(v)
-@@ -210,20 +215,20 @@
+@@ -210,20 +214,20 @@
except:
pass
if len(pvals)!=len(punits) or len(pvals)!=len(pnams):
@@ -238,7 +239,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
punit = list(parameter_units)
if isinstance(parameter_values,(list,tuple)):
pvals = list(parameter_values)
-@@ -231,11 +236,11 @@
+@@ -231,11 +235,11 @@
try:
pvals = numpy.ascontiguousarray(parameter_values.filled())
except:
@@ -253,7 +254,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
pvals = numpy.ascontiguousarray(pvals).astype('d')
return _cmor.set_grid_mapping(grid_id,mapping_name,pnms,pvals,punit)
-@@ -255,11 +260,11 @@
+@@ -255,11 +259,11 @@
interval: a string used for time axes only (???)
"""
if not isinstance(table_entry,str):
@@ -267,7 +268,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
if has_cdms2 and isinstance(coord_vals,cdms2.axis.TransientAxis):
if units is None:
-@@ -286,10 +291,10 @@
+@@ -286,10 +290,10 @@
coord_vals = numpy.ascontiguousarray(coord_vals.filled())
if not isinstance(coord_vals,numpy.ndarray):
@@ -280,7 +281,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if numpy.ma.isMA(cell_bounds):
cell_bounds = numpy.ascontiguousarray(cell_bounds.filled())
-@@ -304,18 +309,18 @@
+@@ -304,18 +308,18 @@
if cell_bounds is not None:
if numpy.rank(cell_bounds)>2:
@@ -303,7 +304,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
cbnds = 0
-@@ -324,7 +329,7 @@
+@@ -324,7 +328,7 @@
type = coord_vals.dtype.char[0]
if not type in ['i','l','f','d','S']:
@@ -312,7 +313,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if type == 'S':
type = 'c'
-@@ -344,7 +349,7 @@
+@@ -344,7 +348,7 @@
if units is None:
if coord_vals is not None:
@@ -321,7 +322,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
units = "1"
-@@ -359,26 +364,26 @@
+@@ -359,26 +363,26 @@
def variable(table_entry,units,axis_ids,type='f',missing_value=None,tolerance = 1.e-4,positive=None,original_name=None,history=None,comment=None):
if not isinstance(table_entry,str):
@@ -353,7 +354,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
comment = ""
-@@ -391,18 +396,18 @@
+@@ -391,18 +395,18 @@
elif isinstance(axis_ids,(list,tuple)):
axis_ids = numpy.ascontiguousarray(axis_ids)
elif not isinstance(axis_ids, numpy.ndarray):
@@ -376,7 +377,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
ndims = len(axis_ids)
-@@ -422,13 +427,13 @@
+@@ -422,13 +426,13 @@
comment = str(comment)
if not isinstance(tolerance,(float,int,numpy.float,numpy.float32,numpy.int,numpy.int32)):
@@ -392,7 +393,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
missing_value = float(missing_value)
-@@ -438,14 +443,14 @@
+@@ -438,14 +442,14 @@
def zfactor(zaxis_id,zfactor_name,units="",axis_ids=None,type=None,zfactor_values=None,zfactor_bounds=None):
if not isinstance(zaxis_id,(int,numpy.int,numpy.int32)):
@@ -410,7 +411,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if numpy.ma.isMA(axis_ids):
axis_ids = numpy.ascontiguousarray(axis_ids.filled())
-@@ -462,10 +467,10 @@
+@@ -462,10 +466,10 @@
elif isinstance(axis_ids,(int,numpy.int,numpy.int32)):
axis_ids = numpy.array([axis_ids,])
elif not isinstance(axis_ids, numpy.ndarray):
@@ -423,7 +424,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if axis_ids is None:
ndims = 0
-@@ -474,9 +479,9 @@
+@@ -474,9 +478,9 @@
ndims = len(axis_ids)
## if ndims>1 and zfactor_values is not None:
@@ -435,7 +436,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if zfactor_values is not None:
if isinstance(zfactor_values,(float,int,numpy.float,numpy.float32,numpy.int,numpy.int32)):
-@@ -490,7 +495,7 @@
+@@ -490,7 +494,7 @@
elif isinstance(zfactor_values,(list,tuple)):
zfactor_values = numpy.ascontiguousarray(zfactor_values)
elif not isinstance(zfactor_values, numpy.ndarray):
@@ -444,7 +445,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if type is None:
try:
-@@ -501,18 +506,18 @@
+@@ -501,18 +505,18 @@
elif isinstance(zfactor_values,(int,numpy.int,numpy.int32)):
type = 'd'
else:
@@ -466,7 +467,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if zfactor_bounds is not None:
if numpy.ma.isMA(zfactor_bounds):
-@@ -524,19 +529,19 @@
+@@ -524,19 +528,19 @@
elif isinstance(zfactor_bounds,(list,tuple)):
zfactor_bounds = numpy.ascontiguousarray(zfactor_bounds)
elif not isinstance(zfactor_bounds, numpy.ndarray):
@@ -490,7 +491,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
bnds.append(zfactor_bounds[-1][1])
zfactor_bounds=numpy.array(bnds)
axis_ids = axis_ids.astype('i')
-@@ -551,15 +556,15 @@
+@@ -551,15 +555,15 @@
ierr = write(var_id,data,ntimes_passed=None,file_suffix="",time_vals=None,time_bnds=None,store_with=None
"""
if not isinstance(var_id,(int,numpy.int,numpy.int32)):
@@ -509,7 +510,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
store_with = int(store_with)
if numpy.ma.isMA(data):
-@@ -573,7 +578,7 @@
+@@ -573,7 +577,7 @@
elif isinstance(data,(list,tuple)):
data = numpy.ascontiguousarray(data)
elif not isinstance(data, numpy.ndarray):
@@ -518,7 +519,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if time_vals is None:
-@@ -594,12 +599,12 @@
+@@ -594,12 +598,12 @@
try:
time_vals = numpy.ascontiguousarray(time_vals)
except:
@@ -533,7 +534,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
time_vals=time_vals.astype("d")
-@@ -609,7 +614,7 @@
+@@ -609,7 +613,7 @@
else:
ntimes_passed = len(time_vals)
if not isinstance(ntimes_passed,(int,numpy.int,numpy.int32)):
@@ -542,7 +543,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
ntimes_passed = int(ntimes_passed)
-@@ -627,7 +632,7 @@
+@@ -627,7 +631,7 @@
if goodshape[i]!=0:
if sh[j]!=goodshape[i]:
if goodshape[i]!=1:
@@ -551,7 +552,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
j+=1
elif ntimes_passed!=1:
j+=1
-@@ -649,13 +654,13 @@
+@@ -649,13 +653,13 @@
elif isinstance(time_bnds,(list,tuple)):
time_bnds = numpy.ascontiguousarray(time_bnds)
elif not isinstance(time_bnds, numpy.ndarray):
@@ -568,7 +569,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
bnds =[]
if time_bnds.shape[0] > 1:
_check_time_bounds_contiguous(time_bnds)
-@@ -669,7 +674,7 @@
+@@ -669,7 +673,7 @@
else:
ltv=len(time_vals)
if len(time_bnds)!=ltv+1:
@@ -577,7 +578,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
bnds=[]
for i in range(ltv):
bnds.append([time_bnds[i],time_bnds[i+1]])
-@@ -680,12 +685,12 @@
+@@ -680,12 +684,12 @@
if time_bnds is not None:
type = time_bnds.dtype.char
if not type in ['f','d','i','l']:
@@ -592,7 +593,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
return _cmor.write(var_id,data,type,file_suffix,ntimes_passed,time_vals,time_bnds,store_with)
-@@ -696,7 +701,7 @@
+@@ -696,7 +700,7 @@
for i in range(time_bnds.shape[0] - 1 ):
b = time_bnds[i]
if b[1]!=time_bnds[i+1][0]:
@@ -601,7 +602,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
def _flatten_time_bounds(time_bnds):
'''
-@@ -721,21 +726,21 @@
+@@ -721,21 +725,21 @@
create_subdirectories: 1 to create subdirectories structure, 0 to dump files directly where cmor_dataset tells to
"""
if not isinstance(exit_control,int) or not exit_control in [ cmor_const.CMOR_EXIT_ON_WARNING, cmor_const.CMOR_EXIT_ON_MAJOR, cmor_const.CMOR_NORMAL]:
@@ -628,7 +629,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
return _cmor.setup(inpath,netcdf_file_action,set_verbosity,exit_control,logfile,create_subdirectories)
def load_table(table):
-@@ -744,7 +749,7 @@
+@@ -744,7 +748,7 @@
load_table(table)
"""
if not isinstance(table,str):
@@ -637,7 +638,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
## if not os.path.exists(table):
## raise Exception, "Error, the table you specified (%s) does not exists" % table
return _cmor.load_table(table)
-@@ -782,7 +787,7 @@
+@@ -782,7 +786,7 @@
if not isinstance(st,str):
for o in dir():
if locals()[o] is st:
@@ -646,7 +647,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
calendar = calendar.lower()
-@@ -790,7 +795,7 @@
+@@ -790,7 +794,7 @@
if not isinstance(i,int):
for o in dir():
if locals()[o] is i:
@@ -655,7 +656,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if isinstance(month_lengths,(list,tuple)):
month_lengths = numpy.array(month_lengths)
elif has_cdms2 and cdms2.isVariable(month_lengths):
-@@ -802,26 +807,26 @@
+@@ -802,26 +806,26 @@
if isinstance(month_lengths,numpy.ndarray):
if not numpy.rank(month_lengths)==1:
@@ -688,7 +689,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
else:
branch_time=float(branch_time)
-@@ -829,7 +834,7 @@
+@@ -829,7 +833,7 @@
def set_table(table):
if not isinstance(table,int):
@@ -697,7 +698,7 @@ Index: cmor-2.8.3/Lib/pywrapper.py
return _cmor.set_table(table)
def close(var_id=None,file_name=False, preserve=False):
-@@ -842,7 +847,7 @@
+@@ -842,7 +846,7 @@
[preserve] True/False (default False) if True: close the file but preserve the var definition in CMOR to write more data with this variable (into a new file)
"""
if var_id is not None and not isinstance(var_id,int):
@@ -708,8 +709,8 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if (file_name is False):
Index: cmor-2.8.3/Lib/__init__.py
===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py 2013-06-15 06:40:06.000000000 +0100
@@ -1,9 +1,9 @@
-from cmor_const import *
-
@@ -728,8 +729,8 @@ Index: cmor-2.8.3/Lib/__init__.py
pass
Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
===================================================================
---- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cdms2
@@ -1152,8 +1153,8 @@ Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
Index: cmor-2.8.3/Test/check_results.py
===================================================================
---- cmor-2.8.3.orig/Test/check_results.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from out_files import out
@@ -1203,8 +1204,8 @@ Index: cmor-2.8.3/Test/check_results.py
+ raise CMORResultCheckError(["Error checking output files for test: Test/%s.f90 we could only find %i files when %i were expected.\n\n Expected files: \n\t%s\n\nPresent files: \n\t%s\n\nMissing files: \n\t%s\n" % (test,nfiles,len(outfiles),repr(outfiles),repr(gotfiles),repr(missing)),])
Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,11 +1,13 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1282,8 +1283,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
f.close()
Index: cmor-2.8.3/setup.py.in
===================================================================
---- cmor-2.8.3.orig/setup.py.in 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/setup.py.in 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/setup.py.in 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/setup.py.in 2013-06-15 06:38:50.000000000 +0100
@@ -1,8 +1,10 @@
+from __future__ import print_function # to be python2/python3 agnostic
import numpy
@@ -1316,8 +1317,8 @@ Index: cmor-2.8.3/setup.py.in
version='2.0',
Index: cmor-2.8.3/Test/cmor_speed_and_compression_02.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_02.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_02.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_02.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1390,8 +1391,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_02.py
f.close()
Index: cmor-2.8.3/Test/cmor_speed_and_compression.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -1453,8 +1454,8 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression.py
f.close()
Index: cmor-2.8.3/Test/jamie_hybrid_height.py
===================================================================
---- cmor-2.8.3.orig/Test/jamie_hybrid_height.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/jamie_hybrid_height.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/jamie_hybrid_height.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1491,8 +1492,8 @@ Index: cmor-2.8.3/Test/jamie_hybrid_height.py
Index: cmor-2.8.3/Test/nc2asc.py
===================================================================
---- cmor-2.8.3.orig/Test/nc2asc.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/nc2asc.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/nc2asc.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/nc2asc.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1584,8 +1585,8 @@ Index: cmor-2.8.3/Test/nc2asc.py
f.close()
Index: cmor-2.8.3/Src/_cmormodule.c
===================================================================
---- cmor-2.8.3.orig/Src/_cmormodule.c 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Src/_cmormodule.c 2013-06-14 16:12:05.000000000 +0100
+--- cmor-2.8.3.orig/Src/_cmormodule.c 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Src/_cmormodule.c 2013-06-15 06:38:50.000000000 +0100
@@ -2,6 +2,26 @@
#include "numpy/arrayobject.h"
#include "cmor.h"
@@ -1681,8 +1682,8 @@ Index: cmor-2.8.3/Src/_cmormodule.c
/* int main(int argc,char **argv) */
Index: cmor-2.8.3/Test/test_compression.py
===================================================================
---- cmor-2.8.3.orig/Test/test_compression.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_compression.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_compression.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_compression.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,8 +1,9 @@
+from __future__ import print_function
import sys,os
@@ -1720,8 +1721,8 @@ Index: cmor-2.8.3/Test/test_compression.py
cmor.write(var_id2,s)
Index: cmor-2.8.3/Test/test_grid_stub_jamie.py
===================================================================
---- cmor-2.8.3.orig/Test/test_grid_stub_jamie.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_grid_stub_jamie.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_grid_stub_jamie.py 2013-06-15 06:38:50.000000000 +0100
@@ -71,7 +71,7 @@
try:
grid([[1], [2]])
@@ -1813,8 +1814,8 @@ Index: cmor-2.8.3/Test/test_grid_stub_jamie.py
Index: cmor-2.8.3/Test/test_python_2Gb_file.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_2Gb_file.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_file.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_file.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1839,8 +1840,8 @@ Index: cmor-2.8.3/Test/test_python_2Gb_file.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_2Gb_slice.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_2Gb_slice.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_2Gb_slice.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_2Gb_slice.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1874,8 +1875,8 @@ Index: cmor-2.8.3/Test/test_python_2Gb_slice.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_3hr.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_3hr.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_3hr.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_3hr.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1892,8 +1893,8 @@ Index: cmor-2.8.3/Test/test_python_3hr.py
ilon = cmor.time_varying_grid_coordinate(igrid,table_entry='longitude',units='degrees_east')
Index: cmor-2.8.3/Test/test_python_appending.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_appending.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_appending.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_appending.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_appending.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1965,8 +1966,8 @@ Index: cmor-2.8.3/Test/test_python_appending.py
+print(f2)
Index: cmor-2.8.3/Test/test_python_bad_date.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bad_date.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bad_date.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bad_date.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2005,8 +2006,8 @@ Index: cmor-2.8.3/Test/test_python_bad_date.py
Index: cmor-2.8.3/Test/test_python_bentley_01.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bentley_01.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bentley_01.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bentley_01.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2050,8 +2051,8 @@ Index: cmor-2.8.3/Test/test_python_bentley_01.py
if __name__ == '__main__':
Index: cmor-2.8.3/Test/test_python_bounds_request.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_bounds_request.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_bounds_request.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_bounds_request.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2086,8 +2087,8 @@ Index: cmor-2.8.3/Test/test_python_bounds_request.py
iv = cmor.variable(table_entry='ta',axis_ids=numpy.array((itim,ilev,ilat,ilon)),units='K')
Index: cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_cfmip_site_axis_test.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_cfmip_site_axis_test.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py 2013-06-15 06:38:50.000000000 +0100
@@ -28,6 +28,7 @@
lev:formula_terms = "a: lev b: b orog: orog";
...
@@ -2148,8 +2149,8 @@ Index: cmor-2.8.3/Test/test_python_cfmip_site_axis_test.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_clim_bounds.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2167,8 +2168,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_02.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_02.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_02.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_02.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2186,8 +2187,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_02.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_03.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_03.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_03.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_03.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2214,8 +2215,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_03.py
Index: cmor-2.8.3/Test/test_python_clim_bounds_04.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_clim_bounds_04.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_clim_bounds_04.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_clim_bounds_04.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2233,8 +2234,8 @@ Index: cmor-2.8.3/Test/test_python_clim_bounds_04.py
Index: cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2251,8 +2252,8 @@ Index: cmor-2.8.3/Test/test_python_YYYMMDDHH_exp_fmt.py
path_test()
Index: cmor-2.8.3/Test/test_python_direct_calls.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_direct_calls.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_direct_calls.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_direct_calls.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2328,8 +2329,8 @@ Index: cmor-2.8.3/Test/test_python_direct_calls.py
cmor._cmor.close(None,0,0)
Index: cmor-2.8.3/Test/test_python_fx.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_fx.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_fx.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_fx.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_fx.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2343,8 +2344,8 @@ Index: cmor-2.8.3/Test/test_python_fx.py
+print(test_mode(cmor.CMOR_REPLACE))
Index: cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_grid_and_ocn_sigma.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2430,8 +2431,8 @@ Index: cmor-2.8.3/Test/test_python_grid_and_ocn_sigma.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_index_coord.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_index_coord.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_index_coord.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_index_coord.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2445,8 +2446,8 @@ Index: cmor-2.8.3/Test/test_python_index_coord.py
+print(f1)
Index: cmor-2.8.3/Test/test_python_jamie_10.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_10.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_10.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_10.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2464,8 +2465,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_10.py
Index: cmor-2.8.3/Test/test_python_jamie_12.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_12.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_12.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_12.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2484,8 +2485,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_12.py
def define_write_var(axis_ids, entry, unit, values):
Index: cmor-2.8.3/Test/test_python_jamie_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_2.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_2.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_2.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2513,8 +2514,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_2.py
if __name__ == '__main__':
Index: cmor-2.8.3/Test/test_python_jamie_6.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_6.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_6.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_6.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2531,8 +2532,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_6.py
units='1',
Index: cmor-2.8.3/Test/test_python_jamie_8.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_8.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_8.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_8.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2565,8 +2566,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_8.py
def cmor_ini():
Index: cmor-2.8.3/Test/test_python_jamie_9.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_9.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_9.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_9.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2584,8 +2585,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_9.py
Index: cmor-2.8.3/Test/test_python_jamie_site_surface.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_jamie_site_surface.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_jamie_site_surface.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_jamie_site_surface.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2602,8 +2603,8 @@ Index: cmor-2.8.3/Test/test_python_jamie_site_surface.py
Index: cmor-2.8.3/Test/test_python_joerg_10.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_10.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_10.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_10.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2648,8 +2649,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_10.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_11.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_11.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_11.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_11.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2694,8 +2695,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_11.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_12.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_12.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_12.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_12.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2740,8 +2741,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_12.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_2.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_2.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_2.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2777,8 +2778,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_2.py
else:
Index: cmor-2.8.3/Test/test_python_joerg_3.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_3.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_3.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_3.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2818,8 +2819,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_3.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_8.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_8.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_8.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_8.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2864,8 +2865,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_8.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_9.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_9.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_9.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_9.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,cdms2
@@ -2890,8 +2891,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_9.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_joerg_tim2_clim.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_joerg_tim2_clim.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_joerg_tim2_clim.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_joerg_tim2_clim.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2915,8 +2916,8 @@ Index: cmor-2.8.3/Test/test_python_joerg_tim2_clim.py
axis_ids,
Index: cmor-2.8.3/Test/test_python_max_variables_2.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_max_variables_2.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_max_variables_2.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_max_variables_2.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2938,8 +2939,8 @@ Index: cmor-2.8.3/Test/test_python_max_variables_2.py
Index: cmor-2.8.3/Test/test_python_memory_check.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_memory_check.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_memory_check.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_memory_check.py 2013-06-15 06:38:50.000000000 +0100
@@ -5,7 +5,7 @@
Memory stats are taken from http://code.activestate.com/recipes/286222/
@@ -2960,8 +2961,8 @@ Index: cmor-2.8.3/Test/test_python_memory_check.py
Index: cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_open_close_cmor_multiple.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_open_close_cmor_multiple.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2983,8 +2984,8 @@ Index: cmor-2.8.3/Test/test_python_open_close_cmor_multiple.py
+print('hello')
Index: cmor-2.8.3/Test/test_python_reverted_lats.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_reverted_lats.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_reverted_lats.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_reverted_lats.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -3001,8 +3002,8 @@ Index: cmor-2.8.3/Test/test_python_reverted_lats.py
cmor.write(ivar2,data,ntimes_passed=1,time_vals=[1.],time_bnds=[1.,2.])
Index: cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3041,8 +3042,8 @@ Index: cmor-2.8.3/Test/test_python_singleton_anywhere_in_table_def.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_singleton_string.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_singleton_string.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_singleton_string.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_singleton_string.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -3082,8 +3083,8 @@ Index: cmor-2.8.3/Test/test_python_singleton_string.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -3101,8 +3102,8 @@ Index: cmor-2.8.3/Test/test_python_stephanie_6hrPlev_minutes.py
Index: cmor-2.8.3/Test/test_python_user_interface_00.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_00.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_00.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_00.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3180,8 +3181,8 @@ Index: cmor-2.8.3/Test/test_python_user_interface_00.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_user_interface_01.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_01.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_01.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_01.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -3217,8 +3218,8 @@ Index: cmor-2.8.3/Test/test_python_user_interface_01.py
cmor.close()
Index: cmor-2.8.3/Test/test_python_user_interface_03.py
===================================================================
---- cmor-2.8.3.orig/Test/test_python_user_interface_03.py 2013-06-14 16:11:48.000000000 +0100
-+++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-14 16:11:48.000000000 +0100
+--- cmor-2.8.3.orig/Test/test_python_user_interface_03.py 2013-06-15 06:38:50.000000000 +0100
++++ cmor-2.8.3/Test/test_python_user_interface_03.py 2013-06-15 06:38:50.000000000 +0100
@@ -1,11 +1,12 @@
+from __future__ import print_functon
import numpy
@@ -3272,3 +3273,13 @@ Index: cmor-2.8.3/Test/test_python_user_interface_03.py
#cmor.close()
-print 'Finito'
+print('Finito')
+Index: cmor-2.8.3/Lib/cmor_const.py
+===================================================================
+--- cmor-2.8.3.orig/Lib/cmor_const.py 2013-06-14 16:13:00.000000000 +0100
++++ cmor-2.8.3/Lib/cmor_const.py 2013-06-15 06:39:52.000000000 +0100
+@@ -1,4 +1,4 @@
+-import _cmor
++from . import _cmor
+ atts = """
+ CMOR_MAX_STRING
+ CMOR_MAX_ELEMENTS
diff --git a/debian/rules b/debian/rules
index e75047e..4a5e13f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,10 +46,9 @@ ifeq ( $(BUILD_ARCH_OS)-$(BUILD_ARCH_CPU), kfreebsd-i386)
else
dh_auto_test
endif
-
-
-# # for p in $(PYVERS) ; do \
+ for p in $(PYVERS) $(PY3VERS) ; do \
$(MAKE) test_python PYTHONEXEC=$$p DESTDIR=$(DESTDIR) ; done
+
override_dh_auto_install:
$(MAKE) install DESTDIR=$(DESTDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list