[cmor] 03/13: CHanges to _cmip6_cv for python3
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 20 10:37:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit ccaa07af2d6727d47beb87cb04344f5c74a943ac
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Dec 20 12:05:08 2016 +0000
CHanges to _cmip6_cv for python3
---
debian/patches/python3.patch | 393 +++++++++++++++++++++++-----------------
debian/patches/shlib-link.patch | 26 ++-
2 files changed, 241 insertions(+), 178 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 8c89c9a..40b8cf7 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Fixes needed to make code python2/3 compatible. NOTE: INCOMPLETE
Last-Updated: 2016-12-19
Forwarded: no
-Index: cmor-3.2.0/Lib/git2svn.py
+Index: cmor-3.2.1/Lib/git2svn.py
===================================================================
---- cmor-3.2.0.orig/Lib/git2svn.py
-+++ cmor-3.2.0/Lib/git2svn.py
+--- cmor-3.2.1.orig/Lib/git2svn.py
++++ cmor-3.2.1/Lib/git2svn.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os,sys
@@ -31,10 +31,10 @@ Index: cmor-3.2.0/Lib/git2svn.py
- print 'svn del :',cmd
+ print('svn del :',cmd)
os.popen(cmd).readlines()
-Index: cmor-3.2.0/Lib/pywrapper.py
+Index: cmor-3.2.1/Lib/pywrapper.py
===================================================================
---- cmor-3.2.0.orig/Lib/pywrapper.py
-+++ cmor-3.2.0/Lib/pywrapper.py
+--- cmor-3.2.1.orig/Lib/pywrapper.py
++++ cmor-3.2.1/Lib/pywrapper.py
@@ -1,8 +1,8 @@
import numpy
import os
@@ -464,10 +464,10 @@ Index: cmor-3.2.0/Lib/pywrapper.py
if (preserve is False):
if (file_name is False):
-Index: cmor-3.2.0/Test/check_results.py
+Index: cmor-3.2.1/Test/check_results.py
===================================================================
---- cmor-3.2.0.orig/Test/check_results.py
-+++ cmor-3.2.0/Test/check_results.py
+--- cmor-3.2.1.orig/Test/check_results.py
++++ cmor-3.2.1/Test/check_results.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from out_files import out
@@ -515,10 +515,10 @@ Index: cmor-3.2.0/Test/check_results.py
elif nfiles!=len(outfiles):
- 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)),]
+ 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-3.2.0/setup.py.in
+Index: cmor-3.2.1/setup.py.in
===================================================================
---- cmor-3.2.0.orig/setup.py.in
-+++ cmor-3.2.0/setup.py.in
+--- cmor-3.2.1.orig/setup.py.in
++++ cmor-3.2.1/setup.py.in
@@ -1,3 +1,5 @@
+
+from __future__ import print_function # to be python2/python3 agnostic
@@ -544,10 +544,10 @@ Index: cmor-3.2.0/setup.py.in
setup (name = "CMOR",
version='3.2',
-Index: cmor-3.2.0/Test/cmor_speed_and_compression_02.py
+Index: cmor-3.2.1/Test/cmor_speed_and_compression_02.py
===================================================================
---- cmor-3.2.0.orig/Test/cmor_speed_and_compression_02.py
-+++ cmor-3.2.0/Test/cmor_speed_and_compression_02.py
+--- cmor-3.2.1.orig/Test/cmor_speed_and_compression_02.py
++++ cmor-3.2.1/Test/cmor_speed_and_compression_02.py
@@ -5,7 +5,7 @@ today = strftime("%Y%m%d", localtime())
try:
import cdms2
@@ -616,10 +616,10 @@ Index: cmor-3.2.0/Test/cmor_speed_and_compression_02.py
f=open("summary.txt","w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.0/Test/cmor_speed_and_compression.py
+Index: cmor-3.2.1/Test/cmor_speed_and_compression.py
===================================================================
---- cmor-3.2.0.orig/Test/cmor_speed_and_compression.py
-+++ cmor-3.2.0/Test/cmor_speed_and_compression.py
+--- cmor-3.2.1.orig/Test/cmor_speed_and_compression.py
++++ cmor-3.2.1/Test/cmor_speed_and_compression.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,sys,os
@@ -679,10 +679,10 @@ Index: cmor-3.2.0/Test/cmor_speed_and_compression.py
f=open("summary.txt","w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.0/Test/jamie_hybrid_height.py
+Index: cmor-3.2.1/Test/jamie_hybrid_height.py
===================================================================
---- cmor-3.2.0.orig/Test/jamie_hybrid_height.py
-+++ cmor-3.2.0/Test/jamie_hybrid_height.py
+--- cmor-3.2.1.orig/Test/jamie_hybrid_height.py
++++ cmor-3.2.1/Test/jamie_hybrid_height.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -717,10 +717,10 @@ Index: cmor-3.2.0/Test/jamie_hybrid_height.py
cmor.close()
-Index: cmor-3.2.0/Test/nc2asc.py
+Index: cmor-3.2.1/Test/nc2asc.py
===================================================================
---- cmor-3.2.0.orig/Test/nc2asc.py
-+++ cmor-3.2.0/Test/nc2asc.py
+--- cmor-3.2.1.orig/Test/nc2asc.py
++++ cmor-3.2.1/Test/nc2asc.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -810,10 +810,10 @@ Index: cmor-3.2.0/Test/nc2asc.py
+print(j,s[-1])
f.close()
-Index: cmor-3.2.0/Test/test_compression.py
+Index: cmor-3.2.1/Test/test_compression.py
===================================================================
---- cmor-3.2.0.orig/Test/test_compression.py
-+++ cmor-3.2.0/Test/test_compression.py
+--- cmor-3.2.1.orig/Test/test_compression.py
++++ cmor-3.2.1/Test/test_compression.py
@@ -1,8 +1,9 @@
+from __future__ import print_function
import sys,os
@@ -849,10 +849,10 @@ Index: cmor-3.2.0/Test/test_compression.py
cmor.write(var_id1,s)
cmor.close(var_id1)
cmor.write(var_id2,s)
-Index: cmor-3.2.0/Test/test_grid_stub_jamie.py
+Index: cmor-3.2.1/Test/test_grid_stub_jamie.py
===================================================================
---- cmor-3.2.0.orig/Test/test_grid_stub_jamie.py
-+++ cmor-3.2.0/Test/test_grid_stub_jamie.py
+--- cmor-3.2.1.orig/Test/test_grid_stub_jamie.py
++++ cmor-3.2.1/Test/test_grid_stub_jamie.py
@@ -71,7 +71,7 @@ class TestGridCallErrors(unittest.TestCa
try:
grid([[1], [2]])
@@ -942,10 +942,10 @@ Index: cmor-3.2.0/Test/test_grid_stub_jamie.py
self.assertEquals("longitude_vertices's rank does not match number of axes passed via axis_ids +1 (for vertices)",
str(e))
-Index: cmor-3.2.0/Test/test_python_2Gb_file.py
+Index: cmor-3.2.1/Test/test_python_2Gb_file.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_2Gb_file.py
-+++ cmor-3.2.0/Test/test_python_2Gb_file.py
+--- cmor-3.2.1.orig/Test/test_python_2Gb_file.py
++++ cmor-3.2.1/Test/test_python_2Gb_file.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -968,10 +968,10 @@ Index: cmor-3.2.0/Test/test_python_2Gb_file.py
-print 'hello'
+print('hello')
-Index: cmor-3.2.0/Test/test_python_2Gb_slice.py
+Index: cmor-3.2.1/Test/test_python_2Gb_slice.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_2Gb_slice.py
-+++ cmor-3.2.0/Test/test_python_2Gb_slice.py
+--- cmor-3.2.1.orig/Test/test_python_2Gb_slice.py
++++ cmor-3.2.1/Test/test_python_2Gb_slice.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1014,10 +1014,10 @@ Index: cmor-3.2.0/Test/test_python_2Gb_slice.py
-print 'hello'
+print ('hello')
-Index: cmor-3.2.0/Test/test_python_3hr.py
+Index: cmor-3.2.1/Test/test_python_3hr.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_3hr.py
-+++ cmor-3.2.0/Test/test_python_3hr.py
+--- cmor-3.2.1.orig/Test/test_python_3hr.py
++++ cmor-3.2.1/Test/test_python_3hr.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1032,10 +1032,10 @@ Index: cmor-3.2.0/Test/test_python_3hr.py
ilat = cmor.time_varying_grid_coordinate(igrid,table_entry='latitude',units='degrees_north')
ilon = cmor.time_varying_grid_coordinate(igrid,table_entry='longitude',units='degrees_east')
-Index: cmor-3.2.0/Test/test_python_appending.py
+Index: cmor-3.2.1/Test/test_python_appending.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_appending.py
-+++ cmor-3.2.0/Test/test_python_appending.py
+--- cmor-3.2.1.orig/Test/test_python_appending.py
++++ cmor-3.2.1/Test/test_python_appending.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1105,10 +1105,10 @@ Index: cmor-3.2.0/Test/test_python_appending.py
f2 = mywrite(data = data[6:], time_vals = numpy.arange(6,12,1), cell_bounds=numpy.arange(6,13,1), append_to=f1)
-print f2
+print(f2)
-Index: cmor-3.2.0/Test/test_python_bad_date.py
+Index: cmor-3.2.1/Test/test_python_bad_date.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_bad_date.py
-+++ cmor-3.2.0/Test/test_python_bad_date.py
+--- cmor-3.2.1.orig/Test/test_python_bad_date.py
++++ cmor-3.2.1/Test/test_python_bad_date.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1145,10 +1145,10 @@ Index: cmor-3.2.0/Test/test_python_bad_date.py
if __name__ == '__main__':
-Index: cmor-3.2.0/Test/test_python_bentley_01.py
+Index: cmor-3.2.1/Test/test_python_bentley_01.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_bentley_01.py
-+++ cmor-3.2.0/Test/test_python_bentley_01.py
+--- cmor-3.2.1.orig/Test/test_python_bentley_01.py
++++ cmor-3.2.1/Test/test_python_bentley_01.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1190,10 +1190,10 @@ Index: cmor-3.2.0/Test/test_python_bentley_01.py
if __name__ == '__main__':
-Index: cmor-3.2.0/Test/test_python_bounds_request.py
+Index: cmor-3.2.1/Test/test_python_bounds_request.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_bounds_request.py
-+++ cmor-3.2.0/Test/test_python_bounds_request.py
+--- cmor-3.2.1.orig/Test/test_python_bounds_request.py
++++ cmor-3.2.1/Test/test_python_bounds_request.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1228,10 +1228,10 @@ Index: cmor-3.2.0/Test/test_python_bounds_request.py
ilev = cmor.axis(table_entry="pressure2",coord_vals=levs,cell_bounds=bnds_req,units="Pa")
iv = cmor.variable(table_entry='ta',axis_ids=numpy.array((itim,ilev,ilat,ilon)),units='K')
-Index: cmor-3.2.0/Test/test_python_cfmip_site_axis_test.py
+Index: cmor-3.2.1/Test/test_python_cfmip_site_axis_test.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_cfmip_site_axis_test.py
-+++ cmor-3.2.0/Test/test_python_cfmip_site_axis_test.py
+--- cmor-3.2.1.orig/Test/test_python_cfmip_site_axis_test.py
++++ cmor-3.2.1/Test/test_python_cfmip_site_axis_test.py
@@ -28,6 +28,7 @@ variables:
lev:formula_terms = "a: lev b: b orog: orog";
...
@@ -1290,10 +1290,10 @@ Index: cmor-3.2.0/Test/test_python_cfmip_site_axis_test.py
# Close CMOR.
cmor.close()
-Index: cmor-3.2.0/Test/test_python_clim_bounds.py
+Index: cmor-3.2.1/Test/test_python_clim_bounds.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_clim_bounds.py
-+++ cmor-3.2.0/Test/test_python_clim_bounds.py
+--- cmor-3.2.1.orig/Test/test_python_clim_bounds.py
++++ cmor-3.2.1/Test/test_python_clim_bounds.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1309,10 +1309,10 @@ Index: cmor-3.2.0/Test/test_python_clim_bounds.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_clim_bounds_02.py
+Index: cmor-3.2.1/Test/test_python_clim_bounds_02.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_clim_bounds_02.py
-+++ cmor-3.2.0/Test/test_python_clim_bounds_02.py
+--- cmor-3.2.1.orig/Test/test_python_clim_bounds_02.py
++++ cmor-3.2.1/Test/test_python_clim_bounds_02.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1328,10 +1328,10 @@ Index: cmor-3.2.0/Test/test_python_clim_bounds_02.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_clim_bounds_03.py
+Index: cmor-3.2.1/Test/test_python_clim_bounds_03.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_clim_bounds_03.py
-+++ cmor-3.2.0/Test/test_python_clim_bounds_03.py
+--- cmor-3.2.1.orig/Test/test_python_clim_bounds_03.py
++++ cmor-3.2.1/Test/test_python_clim_bounds_03.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1356,10 +1356,10 @@ Index: cmor-3.2.0/Test/test_python_clim_bounds_03.py
cmor.write(varid, values)#, ntimes_passed=1)
-Index: cmor-3.2.0/Test/test_python_clim_bounds_04.py
+Index: cmor-3.2.1/Test/test_python_clim_bounds_04.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_clim_bounds_04.py
-+++ cmor-3.2.0/Test/test_python_clim_bounds_04.py
+--- cmor-3.2.1.orig/Test/test_python_clim_bounds_04.py
++++ cmor-3.2.1/Test/test_python_clim_bounds_04.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1375,10 +1375,10 @@ Index: cmor-3.2.0/Test/test_python_clim_bounds_04.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_YYYMMDDHH_exp_fmt.py
+Index: cmor-3.2.1/Test/test_python_YYYMMDDHH_exp_fmt.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
-+++ cmor-3.2.0/Test/test_python_YYYMMDDHH_exp_fmt.py
+--- cmor-3.2.1.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
++++ cmor-3.2.1/Test/test_python_YYYMMDDHH_exp_fmt.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1393,10 +1393,10 @@ Index: cmor-3.2.0/Test/test_python_YYYMMDDHH_exp_fmt.py
if __name__ == '__main__':
path_test()
-Index: cmor-3.2.0/Test/test_python_direct_calls.py
+Index: cmor-3.2.1/Test/test_python_direct_calls.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_direct_calls.py
-+++ cmor-3.2.0/Test/test_python_direct_calls.py
+--- cmor-3.2.1.orig/Test/test_python_direct_calls.py
++++ cmor-3.2.1/Test/test_python_direct_calls.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -1470,10 +1470,10 @@ Index: cmor-3.2.0/Test/test_python_direct_calls.py
cmor._cmor.write(myvars[0],numpy.ravel(data2d),data2d.dtype.char,1,None,None,None);
cmor._cmor.close(None,0,0)
-Index: cmor-3.2.0/Test/test_python_grid_and_ocn_sigma.py
+Index: cmor-3.2.1/Test/test_python_grid_and_ocn_sigma.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_grid_and_ocn_sigma.py
-+++ cmor-3.2.0/Test/test_python_grid_and_ocn_sigma.py
+--- cmor-3.2.1.orig/Test/test_python_grid_and_ocn_sigma.py
++++ cmor-3.2.1/Test/test_python_grid_and_ocn_sigma.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1557,10 +1557,10 @@ Index: cmor-3.2.0/Test/test_python_grid_and_ocn_sigma.py
+ print('Writing time',i,'for eta')
cmor.write(ieta,eta,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2],store_with=myvars[0])
cmor.close()
-Index: cmor-3.2.0/Test/test_python_index_coord.py
+Index: cmor-3.2.1/Test/test_python_index_coord.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_index_coord.py
-+++ cmor-3.2.0/Test/test_python_index_coord.py
+--- cmor-3.2.1.orig/Test/test_python_index_coord.py
++++ cmor-3.2.1/Test/test_python_index_coord.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1572,10 +1572,10 @@ Index: cmor-3.2.0/Test/test_python_index_coord.py
f1 = cmor.close(iv,file_name=True)
-print f1
+print(f1)
-Index: cmor-3.2.0/Test/test_python_jamie_10.py
+Index: cmor-3.2.1/Test/test_python_jamie_10.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_10.py
-+++ cmor-3.2.0/Test/test_python_jamie_10.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_10.py
++++ cmor-3.2.1/Test/test_python_jamie_10.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1591,10 +1591,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_10.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_jamie_12.py
+Index: cmor-3.2.1/Test/test_python_jamie_12.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_12.py
-+++ cmor-3.2.0/Test/test_python_jamie_12.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_12.py
++++ cmor-3.2.1/Test/test_python_jamie_12.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1611,10 +1611,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_12.py
return axis_ids
def define_write_var(axis_ids, entry, unit, values):
-Index: cmor-3.2.0/Test/test_python_jamie_2.py
+Index: cmor-3.2.1/Test/test_python_jamie_2.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_2.py
-+++ cmor-3.2.0/Test/test_python_jamie_2.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_2.py
++++ cmor-3.2.1/Test/test_python_jamie_2.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1640,10 +1640,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_2.py
if __name__ == '__main__':
-Index: cmor-3.2.0/Test/test_python_jamie_6.py
+Index: cmor-3.2.1/Test/test_python_jamie_6.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_6.py
-+++ cmor-3.2.0/Test/test_python_jamie_6.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_6.py
++++ cmor-3.2.1/Test/test_python_jamie_6.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1658,10 +1658,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_6.py
ilev = cmor.axis(
table_entry='standard_sigma',
units='1',
-Index: cmor-3.2.0/Test/test_python_jamie_8.py
+Index: cmor-3.2.1/Test/test_python_jamie_8.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_8.py
-+++ cmor-3.2.0/Test/test_python_jamie_8.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_8.py
++++ cmor-3.2.1/Test/test_python_jamie_8.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1692,10 +1692,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_8.py
def cmor_ini():
-Index: cmor-3.2.0/Test/test_python_jamie_9.py
+Index: cmor-3.2.1/Test/test_python_jamie_9.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_9.py
-+++ cmor-3.2.0/Test/test_python_jamie_9.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_9.py
++++ cmor-3.2.1/Test/test_python_jamie_9.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1711,10 +1711,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_9.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_jamie_site_surface.py
+Index: cmor-3.2.1/Test/test_python_jamie_site_surface.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_jamie_site_surface.py
-+++ cmor-3.2.0/Test/test_python_jamie_site_surface.py
+--- cmor-3.2.1.orig/Test/test_python_jamie_site_surface.py
++++ cmor-3.2.1/Test/test_python_jamie_site_surface.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1729,10 +1729,10 @@ Index: cmor-3.2.0/Test/test_python_jamie_site_surface.py
if __name__ == '__main__':
-Index: cmor-3.2.0/Test/test_python_joerg_10.py
+Index: cmor-3.2.1/Test/test_python_joerg_10.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_10.py
-+++ cmor-3.2.0/Test/test_python_joerg_10.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_10.py
++++ cmor-3.2.1/Test/test_python_joerg_10.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -1779,10 +1779,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_10.py
+ print (Time[i:i+2],bnds_time[2*i:2*i+4])
cmor.write(myvars[0],data2d,2,time_vals=numpy.arange(i,i+2),time_bnds=numpy.arange(i,i+3))
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_11.py
+Index: cmor-3.2.1/Test/test_python_joerg_11.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_11.py
-+++ cmor-3.2.0/Test/test_python_joerg_11.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_11.py
++++ cmor-3.2.1/Test/test_python_joerg_11.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -1825,10 +1825,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_11.py
+ print(Time[i],bnds_time[2*i:2*i+2] )
cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_12.py
+Index: cmor-3.2.1/Test/test_python_joerg_12.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_12.py
-+++ cmor-3.2.0/Test/test_python_joerg_12.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_12.py
++++ cmor-3.2.1/Test/test_python_joerg_12.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -1871,10 +1871,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_12.py
+ print(Time[i],bnds_time[2*i:2*i+2] )
cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_2.py
+Index: cmor-3.2.1/Test/test_python_joerg_2.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_2.py
-+++ cmor-3.2.0/Test/test_python_joerg_2.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_2.py
++++ cmor-3.2.1/Test/test_python_joerg_2.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1908,10 +1908,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_2.py
if i==0:
mode = cmor.CMOR_REPLACE
else:
-Index: cmor-3.2.0/Test/test_python_joerg_3.py
+Index: cmor-3.2.1/Test/test_python_joerg_3.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_3.py
-+++ cmor-3.2.0/Test/test_python_joerg_3.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_3.py
++++ cmor-3.2.1/Test/test_python_joerg_3.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -1954,10 +1954,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_3.py
cmor.close()
print cmor.close(ivar1,True)
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_8.py
+Index: cmor-3.2.1/Test/test_python_joerg_8.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_8.py
-+++ cmor-3.2.0/Test/test_python_joerg_8.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_8.py
++++ cmor-3.2.1/Test/test_python_joerg_8.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2000,10 +2000,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_8.py
+ print(Time[i],bnds_time[2*i:2*i+2] )
cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_9.py
+Index: cmor-3.2.1/Test/test_python_joerg_9.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_9.py
-+++ cmor-3.2.0/Test/test_python_joerg_9.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_9.py
++++ cmor-3.2.1/Test/test_python_joerg_9.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy,cdms2
@@ -2026,10 +2026,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_9.py
+ print('dumped to:',fnm)
cmor.close()
-Index: cmor-3.2.0/Test/test_python_joerg_tim2_clim.py
+Index: cmor-3.2.1/Test/test_python_joerg_tim2_clim.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_joerg_tim2_clim.py
-+++ cmor-3.2.0/Test/test_python_joerg_tim2_clim.py
+--- cmor-3.2.1.orig/Test/test_python_joerg_tim2_clim.py
++++ cmor-3.2.1/Test/test_python_joerg_tim2_clim.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2051,10 +2051,10 @@ Index: cmor-3.2.0/Test/test_python_joerg_tim2_clim.py
varid = cmor.variable(var,
units,
axis_ids,
-Index: cmor-3.2.0/Test/test_python_max_variables_2.py
+Index: cmor-3.2.1/Test/test_python_max_variables_2.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_max_variables_2.py
-+++ cmor-3.2.0/Test/test_python_max_variables_2.py
+--- cmor-3.2.1.orig/Test/test_python_max_variables_2.py
++++ cmor-3.2.1/Test/test_python_max_variables_2.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2074,10 +2074,10 @@ Index: cmor-3.2.0/Test/test_python_max_variables_2.py
else:
ierr = cmor.close(var3d_ids, False, True)
-Index: cmor-3.2.0/Test/test_python_memory_check.py
+Index: cmor-3.2.1/Test/test_python_memory_check.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_memory_check.py
-+++ cmor-3.2.0/Test/test_python_memory_check.py
+--- cmor-3.2.1.orig/Test/test_python_memory_check.py
++++ cmor-3.2.1/Test/test_python_memory_check.py
@@ -5,7 +5,7 @@ Note the memory size from repeated calls
Memory stats are taken from http://code.activestate.com/recipes/286222/
@@ -2096,10 +2096,10 @@ Index: cmor-3.2.0/Test/test_python_memory_check.py
cmor.close(varid)
-Index: cmor-3.2.0/Test/test_python_open_close_cmor_multiple.py
+Index: cmor-3.2.1/Test/test_python_open_close_cmor_multiple.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_open_close_cmor_multiple.py
-+++ cmor-3.2.0/Test/test_python_open_close_cmor_multiple.py
+--- cmor-3.2.1.orig/Test/test_python_open_close_cmor_multiple.py
++++ cmor-3.2.1/Test/test_python_open_close_cmor_multiple.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2119,10 +2119,10 @@ Index: cmor-3.2.0/Test/test_python_open_close_cmor_multiple.py
-print 'hello'
+print('hello')
-Index: cmor-3.2.0/Test/test_python_reverted_lats.py
+Index: cmor-3.2.1/Test/test_python_reverted_lats.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_reverted_lats.py
-+++ cmor-3.2.0/Test/test_python_reverted_lats.py
+--- cmor-3.2.1.orig/Test/test_python_reverted_lats.py
++++ cmor-3.2.1/Test/test_python_reverted_lats.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor,numpy
@@ -2137,10 +2137,10 @@ Index: cmor-3.2.0/Test/test_python_reverted_lats.py
ivar2 = cmor.variable(table_entry='tasmin',units='K',axis_ids=[itim,ilat2,ilon])
cmor.write(ivar2,data,ntimes_passed=1,time_vals=[1.],time_bnds=[1.,2.])
-Index: cmor-3.2.0/Test/test_python_singleton_anywhere_in_table_def.py
+Index: cmor-3.2.1/Test/test_python_singleton_anywhere_in_table_def.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_singleton_anywhere_in_table_def.py
-+++ cmor-3.2.0/Test/test_python_singleton_anywhere_in_table_def.py
+--- cmor-3.2.1.orig/Test/test_python_singleton_anywhere_in_table_def.py
++++ cmor-3.2.1/Test/test_python_singleton_anywhere_in_table_def.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2177,10 +2177,10 @@ Index: cmor-3.2.0/Test/test_python_singleton_anywhere_in_table_def.py
- print 'wrote'
+ print('wrote')
cmor.close()
-Index: cmor-3.2.0/Test/test_python_singleton_string.py
+Index: cmor-3.2.1/Test/test_python_singleton_string.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_singleton_string.py
-+++ cmor-3.2.0/Test/test_python_singleton_string.py
+--- cmor-3.2.1.orig/Test/test_python_singleton_string.py
++++ cmor-3.2.1/Test/test_python_singleton_string.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -2218,10 +2218,10 @@ Index: cmor-3.2.0/Test/test_python_singleton_string.py
- print 'wrote'
+ print('wrote')
cmor.close()
-Index: cmor-3.2.0/Test/test_python_stephanie_6hrPlev_minutes.py
+Index: cmor-3.2.1/Test/test_python_stephanie_6hrPlev_minutes.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_stephanie_6hrPlev_minutes.py
-+++ cmor-3.2.0/Test/test_python_stephanie_6hrPlev_minutes.py
+--- cmor-3.2.1.orig/Test/test_python_stephanie_6hrPlev_minutes.py
++++ cmor-3.2.1/Test/test_python_stephanie_6hrPlev_minutes.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -2237,10 +2237,10 @@ Index: cmor-3.2.0/Test/test_python_stephanie_6hrPlev_minutes.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.0/Test/test_python_user_interface_00.py
+Index: cmor-3.2.1/Test/test_python_user_interface_00.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_user_interface_00.py
-+++ cmor-3.2.0/Test/test_python_user_interface_00.py
+--- cmor-3.2.1.orig/Test/test_python_user_interface_00.py
++++ cmor-3.2.1/Test/test_python_user_interface_00.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2316,10 +2316,10 @@ Index: cmor-3.2.0/Test/test_python_user_interface_00.py
cmor.write(myvars[0],data2d,1)
cmor.close()
-Index: cmor-3.2.0/Test/test_python_user_interface_01.py
+Index: cmor-3.2.1/Test/test_python_user_interface_01.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_user_interface_01.py
-+++ cmor-3.2.0/Test/test_python_user_interface_01.py
+--- cmor-3.2.1.orig/Test/test_python_user_interface_01.py
++++ cmor-3.2.1/Test/test_python_user_interface_01.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
from test_python_common import * # common subroutines
@@ -2353,10 +2353,10 @@ Index: cmor-3.2.0/Test/test_python_user_interface_01.py
+ print (Time[i],bnds_time[2*i:2*i+2])
cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
cmor.close()
-Index: cmor-3.2.0/Test/test_python_user_interface_03.py
+Index: cmor-3.2.1/Test/test_python_user_interface_03.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_user_interface_03.py
-+++ cmor-3.2.0/Test/test_python_user_interface_03.py
+--- cmor-3.2.1.orig/Test/test_python_user_interface_03.py
++++ cmor-3.2.1/Test/test_python_user_interface_03.py
@@ -3,11 +3,11 @@ import cmor
from time import localtime, strftime
today = strftime("%Y%m%d", localtime())
@@ -2409,20 +2409,20 @@ Index: cmor-3.2.0/Test/test_python_user_interface_03.py
#cmor.close()
-print 'Finito'
+print('Finito')
-Index: cmor-3.2.0/Lib/cmor_const.py
+Index: cmor-3.2.1/Lib/cmor_const.py
===================================================================
---- cmor-3.2.0.orig/Lib/cmor_const.py
-+++ cmor-3.2.0/Lib/cmor_const.py
+--- cmor-3.2.1.orig/Lib/cmor_const.py
++++ cmor-3.2.1/Lib/cmor_const.py
@@ -1,4 +1,4 @@
-import _cmor
+from . import _cmor
atts = """
CMOR_MAX_STRING
CMOR_MAX_ELEMENTS
-Index: cmor-3.2.0/Test/test_python_common.py
+Index: cmor-3.2.1/Test/test_python_common.py
===================================================================
---- cmor-3.2.0.orig/Test/test_python_common.py
-+++ cmor-3.2.0/Test/test_python_common.py
+--- cmor-3.2.1.orig/Test/test_python_common.py
++++ cmor-3.2.1/Test/test_python_common.py
@@ -105,7 +105,7 @@ def read_3d_input_files(it, varname, n0,
for k in range(n2):
for j in range(n1):
@@ -2432,10 +2432,10 @@ Index: cmor-3.2.0/Test/test_python_common.py
return field
-Index: cmor-3.2.0/Lib/__init__.py
+Index: cmor-3.2.1/Lib/__init__.py
===================================================================
---- cmor-3.2.0.orig/Lib/__init__.py
-+++ cmor-3.2.0/Lib/__init__.py
+--- cmor-3.2.1.orig/Lib/__init__.py
++++ cmor-3.2.1/Lib/__init__.py
@@ -1,12 +1,12 @@
-import os
+mport os
@@ -2460,10 +2460,10 @@ Index: cmor-3.2.0/Lib/__init__.py
+ from .check_CMOR_compliant import checkCMOR
except ImportError:
pass
-Index: cmor-3.2.0/Src/_cmormodule.c
+Index: cmor-3.2.1/Src/_cmormodule.c
===================================================================
---- cmor-3.2.0.orig/Src/_cmormodule.c
-+++ cmor-3.2.0/Src/_cmormodule.c
+--- cmor-3.2.1.orig/Src/_cmormodule.c
++++ cmor-3.2.1/Src/_cmormodule.c
@@ -2,6 +2,23 @@
#include "numpy/arrayobject.h"
#include "cmor.h"
@@ -2583,10 +2583,10 @@ Index: cmor-3.2.0/Src/_cmormodule.c
+ return module;
+#endif
}
-Index: cmor-3.2.0/Test/cmor_speed_and_compression_01.py
+Index: cmor-3.2.1/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-3.2.0.orig/Test/cmor_speed_and_compression_01.py
-+++ cmor-3.2.0/Test/cmor_speed_and_compression_01.py
+--- cmor-3.2.1.orig/Test/cmor_speed_and_compression_01.py
++++ cmor-3.2.1/Test/cmor_speed_and_compression_01.py
@@ -8,7 +8,7 @@ try:
cdms2.setNetcdfDeflateFlag(0)
cdms2.setNetcdfDeflateLevelFlag(0)
@@ -2654,3 +2654,60 @@ Index: cmor-3.2.0/Test/cmor_speed_and_compression_01.py
f = open("summary.txt", "w")
f.write(repr(dic))
f.close()
+Index: cmor-3.2.1/Src/_controlvocabulary.c
+===================================================================
+--- cmor-3.2.1.orig/Src/_controlvocabulary.c
++++ cmor-3.2.1/Src/_controlvocabulary.c
+@@ -546,8 +546,52 @@ static PyMethodDef MyExtractMethods[] =
+ {NULL, NULL} /*sentinel */
+ };
+
++struct module_state {
++ PyObject *error;
++};
++
++#if PY_MAJOR_VERSION >= 3
++#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
++#else
++#define GETSTATE(m) (&_state)
++static struct module_state _state;
++#endif
++
++#if PY_MAJOR_VERSION >= 3
++
++ static int MyExtract_traverse(PyObject *m, visitproc visit, void *arg) {
++ Py_VISIT(GETSTATE(m)->error);
++ return 0;
++ }
++
++ static int MyExtract_clear(PyObject *m) {
++ Py_CLEAR(GETSTATE(m)->error);
++ return 0;
++ }
++
++ static struct PyModuleDef moduledef = {
++ PyModuleDef_HEAD_INIT,
++ "_cmip6_cv",
++ NULL,
++ sizeof(struct module_state),
++ MyExtractMethods,
++ NULL,
++ MyExtract_traverse,
++ MyExtract_clear,
++ NULL
++ };
++#endif
++
+ PyMODINIT_FUNC init_cmip6_cv( void ) {
++#if PY_MAJOR_VERSION >= 3
++ PyObject *module = PyModule_Create(&moduledef);
++#else
+ ( void ) Py_InitModule( "_cmip6_cv", MyExtractMethods );
++#endif
+ import_array( );
++
++#if PY_MAJOR_VERSION >= 3
++ return module;
++#endif
+ }
+
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index 9bde43a..b63d6a7 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -1,18 +1,18 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Bugfix to link libcmor.so.2 against -lossp-uuid
-Last-Updated: 2013-06-13
+Last-Updated: 2016-12-20
Forwarded: no
-Index: cmor-3.1/Makefile.in
+Index: cmor-3.2.1/Makefile.in
===================================================================
---- cmor-3.1.orig/Makefile.in
-+++ cmor-3.1/Makefile.in
+--- cmor-3.2.1.orig/Makefile.in
++++ cmor-3.2.1/Makefile.in
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
FC=@FC@
CC=@CC@
CFLAGS=@CFLAGS@
-@@ -34,6 +33,8 @@ MACROS=@MACROS@
+@@ -34,11 +33,14 @@ MACROS=@MACROS@
# Library name
LIBNAME=libcmor.a
@@ -21,7 +21,13 @@ Index: cmor-3.1/Makefile.in
# Library sources
LIBSOURCES=@LIBSOURCES@
-@@ -47,58 +48,75 @@ INCFILES=@INCFILES@
+ LIBSOURCESCV=@LIBSOURCESCV@
+ LIBFSOURCES=@LIBFSOURCES@
++LIBSOURCESSO=$(patsubst Src/_cmormodule.c,,$(LIBSOURCES))
+
+ LIBFILES=@LIBFILES@
+
+@@ -48,58 +50,75 @@ INCFILES=@INCFILES@
# Temporary Files
TMPFILES=*~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5
DISTFILES=libcmor.a
@@ -31,7 +37,7 @@ Index: cmor-3.1/Makefile.in
all: cmor
@echo
+
-+PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCESCV)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
++PIC_OBJS = $(patsubst %.c, %.pic_o, $(LIBSOURCESSO)) $(patsubst %.f90,%.pic_o, $(LIBFSOURCES))
+
+%.pic_o: %.c
+ @CC@ @CPPFLAGS@ -I/usr/include/ossp -fstack-protector --param=ssp-buffer-size=4 \
@@ -121,7 +127,7 @@ Index: cmor-3.1/Makefile.in
cmor_fortran_interface.o: Src/cmor_fortran_interface.f90
${FC} -c ${FCFLAGS} ${USERFFLAGS} ${DEBUG} ${MACROS} Src/cmor_fortran_interface.f90
cmor: $(LIBFILES) @MAKEDEPPYTHON@
-@@ -132,10 +150,10 @@ backup: clean
+@@ -135,10 +154,10 @@ backup: clean
test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
@echo "All C and Fortran Test passed successfully"
test_C: cmor
@@ -136,7 +142,7 @@ Index: cmor-3.1/Makefile.in
python:
@echo "Building Python interface"
@${PYTHONEXEC} setup.py install @CDATPREFIX@
-@@ -204,7 +222,7 @@ test_python: python
+@@ -207,7 +226,7 @@ test_python: python
test_case:
@echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
@@ -145,7 +151,7 @@ Index: cmor-3.1/Makefile.in
@./${TEST_NAME} ${VERB} < ${INPUT_FILE} ;
@ rm ./${TEST_NAME}
ifeq (@MAKEDEPPYTHON@,python)
-@@ -212,7 +230,7 @@ ifeq (@MAKEDEPPYTHON@,python)
+@@ -215,7 +234,7 @@ ifeq (@MAKEDEPPYTHON@,python)
endif
test_case_old_cmor_tables:
@echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}
--
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