[cmor] 03/04: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Nov 14 14:34:01 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 6281452eb145b0e00ae6e9c59777d41b8514437a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Nov 12 14:23:58 2017 +0000
refresh patches
---
debian/patches/cmor_ver.patch | 10 +-
debian/patches/destdir.patch | 6 +-
debian/patches/disable_tests.patch | 12 +-
debian/patches/makefile-fix.patch | 8 +-
debian/patches/pkgconfig.patch | 10 +-
debian/patches/prepare-name.patch | 6 +-
debian/patches/python3.patch | 432 ++++++++++++++++++-------------------
debian/patches/shlib-link.patch | 12 +-
8 files changed, 248 insertions(+), 248 deletions(-)
diff --git a/debian/patches/cmor_ver.patch b/debian/patches/cmor_ver.patch
index 047706e..9a6c883 100644
--- a/debian/patches/cmor_ver.patch
+++ b/debian/patches/cmor_ver.patch
@@ -3,10 +3,10 @@ Description: Add symbol versioning file.
Last-Updated: 2013-06-11
Forwarded: no
-Index: cmor-3.2.7/cmor.ver
+Index: cmor-3.2.8/cmor.ver
===================================================================
--- /dev/null
-+++ cmor-3.2.7/cmor.ver
++++ cmor-3.2.8/cmor.ver
@@ -0,0 +1,7 @@
+CMOR_2.0.0 {
+ global:
@@ -15,10 +15,10 @@ Index: cmor-3.2.7/cmor.ver
+ Cd*;
+ local: *;
+};
-Index: cmor-3.2.7/configure.ac
+Index: cmor-3.2.8/configure.ac
===================================================================
---- cmor-3.2.7.orig/configure.ac
-+++ cmor-3.2.7/configure.ac
+--- cmor-3.2.8.orig/configure.ac
++++ cmor-3.2.8/configure.ac
@@ -23,7 +23,7 @@ esac
CMOR_VERSION=${PACKAGE_VERSION}" (commit: ${GIT_TAG})"
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index 2282a7e..4672313 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -3,10 +3,10 @@ Description: Add DESTDIR support for installing.
Last-Updated: 2013-06-11
Forwarded: no
-Index: cmor-3.2.5/Makefile.in
+Index: cmor-3.2.8/Makefile.in
===================================================================
---- cmor-3.2.5.orig/Makefile.in
-+++ cmor-3.2.5/Makefile.in
+--- cmor-3.2.8.orig/Makefile.in
++++ cmor-3.2.8/Makefile.in
@@ -133,19 +133,19 @@ distclean: clean
@echo "Completely cleaning [$(WHEREAMI)]..."
@rm -f $(DISTFILES)
diff --git a/debian/patches/disable_tests.patch b/debian/patches/disable_tests.patch
index 2671e56..e3afbcb 100644
--- a/debian/patches/disable_tests.patch
+++ b/debian/patches/disable_tests.patch
@@ -3,11 +3,11 @@ Description: Disable broken tests
Last-Updated: 2016-12-19
Forwarded: no
-Index: cmor-3.2.7/Makefile.in
+Index: cmor-3.2.8/Makefile.in
===================================================================
---- cmor-3.2.7.orig/Makefile.in
-+++ cmor-3.2.7/Makefile.in
-@@ -268,7 +268,7 @@ test_fortran_old_cmor_tables: cmor Table
+--- cmor-3.2.8.orig/Makefile.in
++++ cmor-3.2.8/Makefile.in
+@@ -273,7 +273,7 @@ test_fortran_old_cmor_tables: cmor Table
@env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case_old_cmor_tables
@env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@@ -16,7 +16,7 @@ Index: cmor-3.2.7/Makefile.in
@env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
-@@ -277,7 +277,7 @@ test_fortran_old_cmor_tables: cmor Table
+@@ -282,7 +282,7 @@ test_fortran_old_cmor_tables: cmor Table
@env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@@ -25,7 +25,7 @@ Index: cmor-3.2.7/Makefile.in
@env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
@env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
-@@ -312,7 +312,7 @@ test_fortran: cmor
+@@ -317,7 +317,7 @@ test_fortran: cmor
env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case
env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro.txt" make test_case
env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_1.txt" make test_case
diff --git a/debian/patches/makefile-fix.patch b/debian/patches/makefile-fix.patch
index ee9702e..7c15fab 100644
--- a/debian/patches/makefile-fix.patch
+++ b/debian/patches/makefile-fix.patch
@@ -3,11 +3,11 @@ Description: Need to ensure Tables is made before test_fortran is run
Last-Updated: 2010-10-26
Forwarded: no
-Index: cmor-3.2.5/Makefile.in
+Index: cmor-3.2.8/Makefile.in
===================================================================
---- cmor-3.2.5.orig/Makefile.in
-+++ cmor-3.2.5/Makefile.in
-@@ -251,7 +251,7 @@ test_case_old_cmor_tables:
+--- cmor-3.2.8.orig/Makefile.in
++++ cmor-3.2.8/Makefile.in
+@@ -256,7 +256,7 @@ test_case_old_cmor_tables:
ifeq (@MAKEDEPPYTHON@,python)
@env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
endif
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index c0b115a..1b5a1e8 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: Add FFlags, includedir, fix for directories needed for C;
Last-Updated: 2013-06-10
Forwarded: no
-Index: cmor-3.2.5/cmor.pc.in
+Index: cmor-3.2.8/cmor.pc.in
===================================================================
--- /dev/null
-+++ cmor-3.2.5/cmor.pc.in
++++ cmor-3.2.8/cmor.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=${prefix}
@@ -21,10 +21,10 @@ Index: cmor-3.2.5/cmor.pc.in
+CFlags: -I${prefix}/include
+CFlags: -I${includedir} -I${includedir}/cdTime
+Requires: udunits netcdf ossp-uuid
-Index: cmor-3.2.5/configure.ac
+Index: cmor-3.2.8/configure.ac
===================================================================
---- cmor-3.2.5.orig/configure.ac
-+++ cmor-3.2.5/configure.ac
+--- cmor-3.2.8.orig/configure.ac
++++ cmor-3.2.8/configure.ac
@@ -183,7 +183,7 @@ if [ test ${with_uuidb} != "-yes" ] ; th
UUIDFLAGS=""
fi
diff --git a/debian/patches/prepare-name.patch b/debian/patches/prepare-name.patch
index 1890150..bbb2aa8 100644
--- a/debian/patches/prepare-name.patch
+++ b/debian/patches/prepare-name.patch
@@ -1,7 +1,7 @@
-Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
+Index: cmor-3.2.8/LibCV/PrePARE/PrePARE.py
===================================================================
---- cmor-3.2.7.orig/LibCV/PrePARE/PrePARE.py
-+++ cmor-3.2.7/LibCV/PrePARE/PrePARE.py
+--- cmor-3.2.8.orig/LibCV/PrePARE/PrePARE.py
++++ cmor-3.2.8/LibCV/PrePARE/PrePARE.py
@@ -1,4 +1,4 @@
-#!/user/bin/env python
+#!/usr/bin/python
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 8405453..fab4f11 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: 2017-09-10
Forwarded: no
-Index: cmor-3.2.7/Lib/pywrapper.py
+Index: cmor-3.2.8/Lib/pywrapper.py
===================================================================
---- cmor-3.2.7.orig/Lib/pywrapper.py
-+++ cmor-3.2.7/Lib/pywrapper.py
+--- cmor-3.2.8.orig/Lib/pywrapper.py
++++ cmor-3.2.8/Lib/pywrapper.py
@@ -2,9 +2,9 @@ import numpy
import os
import warnings
@@ -34,10 +34,10 @@ Index: cmor-3.2.7/Lib/pywrapper.py
if not 'value' in ks or not 'units' in ks:
raise Exception(
"error parameter_names key '%s' dictionary does not contain both 'units' and 'value' keys" %
-Index: cmor-3.2.7/Test/check_results.py
+Index: cmor-3.2.8/Test/check_results.py
===================================================================
---- cmor-3.2.7.orig/Test/check_results.py
-+++ cmor-3.2.7/Test/check_results.py
+--- cmor-3.2.8.orig/Test/check_results.py
++++ cmor-3.2.8/Test/check_results.py
@@ -1,5 +1,6 @@
-from out_files import out
-from in_files import input_tables
@@ -83,10 +83,10 @@ Index: cmor-3.2.7/Test/check_results.py
# os.remove(fnm)
else:
missing.append(fnm)
-Index: cmor-3.2.7/setup.py.in
+Index: cmor-3.2.8/setup.py.in
===================================================================
---- cmor-3.2.7.orig/setup.py.in
-+++ cmor-3.2.7/setup.py.in
+--- cmor-3.2.8.orig/setup.py.in
++++ cmor-3.2.8/setup.py.in
@@ -1,3 +1,5 @@
+
+from __future__ import print_function # to be python2/python3 agnostic
@@ -112,10 +112,10 @@ Index: cmor-3.2.7/setup.py.in
setup (name = "CMOR",
version='3.2',
-Index: cmor-3.2.7/Test/jamie_hybrid_height.py
+Index: cmor-3.2.8/Test/jamie_hybrid_height.py
===================================================================
---- cmor-3.2.7.orig/Test/jamie_hybrid_height.py
-+++ cmor-3.2.7/Test/jamie_hybrid_height.py
+--- cmor-3.2.8.orig/Test/jamie_hybrid_height.py
++++ cmor-3.2.8/Test/jamie_hybrid_height.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -151,10 +151,10 @@ Index: cmor-3.2.7/Test/jamie_hybrid_height.py
cmor.close()
-Index: cmor-3.2.7/Test/test_python_appending.py
+Index: cmor-3.2.8/Test/test_python_appending.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_appending.py
-+++ cmor-3.2.7/Test/test_python_appending.py
+--- cmor-3.2.8.orig/Test/test_python_appending.py
++++ cmor-3.2.8/Test/test_python_appending.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -222,7 +222,7 @@ Index: cmor-3.2.7/Test/test_python_appending.py
cmor.close()
return file
-@@ -98,7 +99,7 @@ data = numpy.random.random((ntime, 19, n
+@@ -97,7 +98,7 @@ data = numpy.random.random((ntime, 19, n
f1 = mywrite(data=data[:6], time_vals=numpy.arange(
0, 6, 1), cell_bounds=numpy.arange(0, 7, 1))
@@ -232,10 +232,10 @@ Index: cmor-3.2.7/Test/test_python_appending.py
6, 12, 1), cell_bounds=numpy.arange(6, 13, 1), append_to=f1)
-print f2
+print (f2)
-Index: cmor-3.2.7/Test/test_python_bad_date.py
+Index: cmor-3.2.8/Test/test_python_bad_date.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_bad_date.py
-+++ cmor-3.2.7/Test/test_python_bad_date.py
+--- cmor-3.2.8.orig/Test/test_python_bad_date.py
++++ cmor-3.2.8/Test/test_python_bad_date.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -272,10 +272,10 @@ Index: cmor-3.2.7/Test/test_python_bad_date.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_bentley_01.py
+Index: cmor-3.2.8/Test/test_python_bentley_01.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_bentley_01.py
-+++ cmor-3.2.7/Test/test_python_bentley_01.py
+--- cmor-3.2.8.orig/Test/test_python_bentley_01.py
++++ cmor-3.2.8/Test/test_python_bentley_01.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -317,10 +317,10 @@ Index: cmor-3.2.7/Test/test_python_bentley_01.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_bounds_request.py
+Index: cmor-3.2.8/Test/test_python_bounds_request.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_bounds_request.py
-+++ cmor-3.2.7/Test/test_python_bounds_request.py
+--- cmor-3.2.8.orig/Test/test_python_bounds_request.py
++++ cmor-3.2.8/Test/test_python_bounds_request.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -355,10 +355,10 @@ Index: cmor-3.2.7/Test/test_python_bounds_request.py
ilev = cmor.axis(
table_entry="pressure2",
coord_vals=levs,
-Index: cmor-3.2.7/Test/test_python_cfmip_site_axis_test.py
+Index: cmor-3.2.8/Test/test_python_cfmip_site_axis_test.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_cfmip_site_axis_test.py
-+++ cmor-3.2.7/Test/test_python_cfmip_site_axis_test.py
+--- cmor-3.2.8.orig/Test/test_python_cfmip_site_axis_test.py
++++ cmor-3.2.8/Test/test_python_cfmip_site_axis_test.py
@@ -28,6 +28,7 @@ variables:
lev:formula_terms = "a: lev b: b orog: orog";
...
@@ -423,10 +423,10 @@ Index: cmor-3.2.7/Test/test_python_cfmip_site_axis_test.py
# Close CMOR.
cmor.close()
-Index: cmor-3.2.7/Test/test_python_clim_bounds.py
+Index: cmor-3.2.8/Test/test_python_clim_bounds.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_clim_bounds.py
-+++ cmor-3.2.7/Test/test_python_clim_bounds.py
+--- cmor-3.2.8.orig/Test/test_python_clim_bounds.py
++++ cmor-3.2.8/Test/test_python_clim_bounds.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -442,10 +442,10 @@ Index: cmor-3.2.7/Test/test_python_clim_bounds.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Test/test_python_clim_bounds_02.py
+Index: cmor-3.2.8/Test/test_python_clim_bounds_02.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_clim_bounds_02.py
-+++ cmor-3.2.7/Test/test_python_clim_bounds_02.py
+--- cmor-3.2.8.orig/Test/test_python_clim_bounds_02.py
++++ cmor-3.2.8/Test/test_python_clim_bounds_02.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -461,10 +461,10 @@ Index: cmor-3.2.7/Test/test_python_clim_bounds_02.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Test/test_python_clim_bounds_03.py
+Index: cmor-3.2.8/Test/test_python_clim_bounds_03.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_clim_bounds_03.py
-+++ cmor-3.2.7/Test/test_python_clim_bounds_03.py
+--- cmor-3.2.8.orig/Test/test_python_clim_bounds_03.py
++++ cmor-3.2.8/Test/test_python_clim_bounds_03.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -489,10 +489,10 @@ Index: cmor-3.2.7/Test/test_python_clim_bounds_03.py
cmor.write(varid, values) # , ntimes_passed=1)
-Index: cmor-3.2.7/Test/test_python_clim_bounds_04.py
+Index: cmor-3.2.8/Test/test_python_clim_bounds_04.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_clim_bounds_04.py
-+++ cmor-3.2.7/Test/test_python_clim_bounds_04.py
+--- cmor-3.2.8.orig/Test/test_python_clim_bounds_04.py
++++ cmor-3.2.8/Test/test_python_clim_bounds_04.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -508,10 +508,10 @@ Index: cmor-3.2.7/Test/test_python_clim_bounds_04.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Test/test_python_YYYMMDDHH_exp_fmt.py
+Index: cmor-3.2.8/Test/test_python_YYYMMDDHH_exp_fmt.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
-+++ cmor-3.2.7/Test/test_python_YYYMMDDHH_exp_fmt.py
+--- cmor-3.2.8.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
++++ cmor-3.2.8/Test/test_python_YYYMMDDHH_exp_fmt.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -526,10 +526,10 @@ Index: cmor-3.2.7/Test/test_python_YYYMMDDHH_exp_fmt.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_jamie_10.py
+Index: cmor-3.2.8/Test/test_python_jamie_10.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_10.py
-+++ cmor-3.2.7/Test/test_python_jamie_10.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_10.py
++++ cmor-3.2.8/Test/test_python_jamie_10.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -545,10 +545,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_10.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Test/test_python_jamie_12.py
+Index: cmor-3.2.8/Test/test_python_jamie_12.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_12.py
-+++ cmor-3.2.7/Test/test_python_jamie_12.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_12.py
++++ cmor-3.2.8/Test/test_python_jamie_12.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -565,10 +565,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_12.py
return axis_ids
-Index: cmor-3.2.7/Test/test_python_jamie_2.py
+Index: cmor-3.2.8/Test/test_python_jamie_2.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_2.py
-+++ cmor-3.2.7/Test/test_python_jamie_2.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_2.py
++++ cmor-3.2.8/Test/test_python_jamie_2.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -593,10 +593,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_2.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_jamie_8.py
+Index: cmor-3.2.8/Test/test_python_jamie_8.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_8.py
-+++ cmor-3.2.7/Test/test_python_jamie_8.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_8.py
++++ cmor-3.2.8/Test/test_python_jamie_8.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -627,10 +627,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_8.py
def cmor_ini():
-Index: cmor-3.2.7/Test/test_python_jamie_9.py
+Index: cmor-3.2.8/Test/test_python_jamie_9.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_9.py
-+++ cmor-3.2.7/Test/test_python_jamie_9.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_9.py
++++ cmor-3.2.8/Test/test_python_jamie_9.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -655,10 +655,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_9.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Test/test_python_jamie_site_surface.py
+Index: cmor-3.2.8/Test/test_python_jamie_site_surface.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_site_surface.py
-+++ cmor-3.2.7/Test/test_python_jamie_site_surface.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_site_surface.py
++++ cmor-3.2.8/Test/test_python_jamie_site_surface.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -673,10 +673,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_site_surface.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_joerg_2.py
+Index: cmor-3.2.8/Test/test_python_joerg_2.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_2.py
-+++ cmor-3.2.7/Test/test_python_joerg_2.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_2.py
++++ cmor-3.2.8/Test/test_python_joerg_2.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -710,10 +710,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_2.py
if i == 0:
mode = cmor.CMOR_REPLACE
else:
-Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim.py
+Index: cmor-3.2.8/Test/test_python_joerg_tim2_clim.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_tim2_clim.py
-+++ cmor-3.2.7/Test/test_python_joerg_tim2_clim.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_tim2_clim.py
++++ cmor-3.2.8/Test/test_python_joerg_tim2_clim.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -735,10 +735,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim.py
varid = cmor.variable(var,
units,
axis_ids,
-Index: cmor-3.2.7/Test/test_python_memory_check.py
+Index: cmor-3.2.8/Test/test_python_memory_check.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_memory_check.py
-+++ cmor-3.2.7/Test/test_python_memory_check.py
+--- cmor-3.2.8.orig/Test/test_python_memory_check.py
++++ cmor-3.2.8/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/
@@ -757,10 +757,10 @@ Index: cmor-3.2.7/Test/test_python_memory_check.py
cmor.close(varid)
-Index: cmor-3.2.7/Test/test_python_reverted_lats.py
+Index: cmor-3.2.8/Test/test_python_reverted_lats.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_reverted_lats.py
-+++ cmor-3.2.7/Test/test_python_reverted_lats.py
+--- cmor-3.2.8.orig/Test/test_python_reverted_lats.py
++++ cmor-3.2.8/Test/test_python_reverted_lats.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -775,10 +775,10 @@ Index: cmor-3.2.7/Test/test_python_reverted_lats.py
ivar2 = cmor.variable(
table_entry='tasmin',
-Index: cmor-3.2.7/Test/test_python_stephanie_6hrPlev_minutes.py
+Index: cmor-3.2.8/Test/test_python_stephanie_6hrPlev_minutes.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_stephanie_6hrPlev_minutes.py
-+++ cmor-3.2.7/Test/test_python_stephanie_6hrPlev_minutes.py
+--- cmor-3.2.8.orig/Test/test_python_stephanie_6hrPlev_minutes.py
++++ cmor-3.2.8/Test/test_python_stephanie_6hrPlev_minutes.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -794,20 +794,20 @@ Index: cmor-3.2.7/Test/test_python_stephanie_6hrPlev_minutes.py
axis_id = cmor.axis(**axis)
axis_ids.append(axis_id)
-Index: cmor-3.2.7/Lib/cmor_const.py
+Index: cmor-3.2.8/Lib/cmor_const.py
===================================================================
---- cmor-3.2.7.orig/Lib/cmor_const.py
-+++ cmor-3.2.7/Lib/cmor_const.py
+--- cmor-3.2.8.orig/Lib/cmor_const.py
++++ cmor-3.2.8/Lib/cmor_const.py
@@ -1,4 +1,4 @@
-import _cmor
+from . import _cmor
atts = """
CMOR_MAX_STRING
CMOR_MAX_ELEMENTS
-Index: cmor-3.2.7/Lib/__init__.py
+Index: cmor-3.2.8/Lib/__init__.py
===================================================================
---- cmor-3.2.7.orig/Lib/__init__.py
-+++ cmor-3.2.7/Lib/__init__.py
+--- cmor-3.2.8.orig/Lib/__init__.py
++++ cmor-3.2.8/Lib/__init__.py
@@ -4,9 +4,9 @@ xml_pth = os.path.join(sys.prefix, "shar
if os.path.exists(xml_pth):
os.environ["UDUNITS2_XML_PATH"] = xml_pth
@@ -828,10 +828,10 @@ Index: cmor-3.2.7/Lib/__init__.py
+ from .check_CMOR_compliant import checkCMOR
except ImportError:
pass
-Index: cmor-3.2.7/Src/_cmormodule.c
+Index: cmor-3.2.8/Src/_cmormodule.c
===================================================================
---- cmor-3.2.7.orig/Src/_cmormodule.c
-+++ cmor-3.2.7/Src/_cmormodule.c
+--- cmor-3.2.8.orig/Src/_cmormodule.c
++++ cmor-3.2.8/Src/_cmormodule.c
@@ -3,6 +3,23 @@
#include "numpy/arrayobject.h"
#include "cmor.h"
@@ -856,7 +856,7 @@ Index: cmor-3.2.7/Src/_cmormodule.c
static PyObject *CMORError;
volatile sig_atomic_t raise_exception = 0;
char *exception_message = "Problem with 'cmor.%s'. Please check the logfile "
-@@ -399,7 +416,11 @@ static PyObject *PyCMOR_axis(PyObject *
+@@ -430,7 +447,11 @@ static PyObject *PyCMOR_axis(PyObject *
char *units;
char *interval;
int length;
@@ -869,7 +869,7 @@ Index: cmor-3.2.7/Src/_cmormodule.c
void *coord_vals;
void *cell_bounds;
int cell_bounds_ndim;
-@@ -410,12 +431,18 @@ static PyObject *PyCMOR_axis(PyObject *
+@@ -441,12 +462,18 @@ static PyObject *PyCMOR_axis(PyObject *
/************************************************************************/
/* HUGE assumtion here is that the data is contiguous! */
/************************************************************************/
@@ -889,7 +889,7 @@ Index: cmor-3.2.7/Src/_cmormodule.c
if (coords_obj == Py_None) {
coord_vals = NULL;
} else {
-@@ -1036,11 +1063,58 @@ static PyMethodDef MyExtractMethods[] =
+@@ -1067,11 +1094,58 @@ static PyMethodDef MyExtractMethods[] =
{NULL, NULL} /*sentinel */
};
@@ -953,10 +953,10 @@ Index: cmor-3.2.7/Src/_cmormodule.c
+#endif
+
}
-Index: cmor-3.2.7/Test/cmor_speed_and_compression_01.py
+Index: cmor-3.2.8/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-3.2.7.orig/Test/cmor_speed_and_compression_01.py
-+++ cmor-3.2.7/Test/cmor_speed_and_compression_01.py
+--- cmor-3.2.8.orig/Test/cmor_speed_and_compression_01.py
++++ cmor-3.2.8/Test/cmor_speed_and_compression_01.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1029,10 +1029,10 @@ Index: cmor-3.2.7/Test/cmor_speed_and_compression_01.py
f = open("summary.txt", "w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.7/Lib/convertCSVFile.py
+Index: cmor-3.2.8/Lib/convertCSVFile.py
===================================================================
---- cmor-3.2.7.orig/Lib/convertCSVFile.py
-+++ cmor-3.2.7/Lib/convertCSVFile.py
+--- cmor-3.2.8.orig/Lib/convertCSVFile.py
++++ cmor-3.2.8/Lib/convertCSVFile.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import csv
@@ -1055,10 +1055,10 @@ Index: cmor-3.2.7/Lib/convertCSVFile.py
expt = deleteComa(expt)
-print expt
+print (expt)
-Index: cmor-3.2.7/Test/test_doc.py
+Index: cmor-3.2.8/Test/test_doc.py
===================================================================
---- cmor-3.2.7.orig/Test/test_doc.py
-+++ cmor-3.2.7/Test/test_doc.py
+--- cmor-3.2.8.orig/Test/test_doc.py
++++ cmor-3.2.8/Test/test_doc.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1071,10 +1071,10 @@ Index: cmor-3.2.7/Test/test_doc.py
-print "File written: ", outfile
+print ("File written: ", outfile)
cmor.close()
-Index: cmor-3.2.7/Test/test_non_monotonic_climo_bonds_ok.py
+Index: cmor-3.2.8/Test/test_non_monotonic_climo_bonds_ok.py
===================================================================
---- cmor-3.2.7.orig/Test/test_non_monotonic_climo_bonds_ok.py
-+++ cmor-3.2.7/Test/test_non_monotonic_climo_bonds_ok.py
+--- cmor-3.2.8.orig/Test/test_non_monotonic_climo_bonds_ok.py
++++ cmor-3.2.8/Test/test_non_monotonic_climo_bonds_ok.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1089,10 +1089,10 @@ Index: cmor-3.2.7/Test/test_non_monotonic_climo_bonds_ok.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_polar_stereo.py
+Index: cmor-3.2.8/Test/test_python_polar_stereo.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_polar_stereo.py
-+++ cmor-3.2.7/Test/test_python_polar_stereo.py
+--- cmor-3.2.8.orig/Test/test_python_polar_stereo.py
++++ cmor-3.2.8/Test/test_python_polar_stereo.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -1118,10 +1118,10 @@ Index: cmor-3.2.7/Test/test_python_polar_stereo.py
myaxes[2] = grid_id
mapnm = 'polar_stereographic'
-Index: cmor-3.2.7/Test/test_checker_works.py
+Index: cmor-3.2.8/Test/test_checker_works.py
===================================================================
---- cmor-3.2.7.orig/Test/test_checker_works.py
-+++ cmor-3.2.7/Test/test_checker_works.py
+--- cmor-3.2.8.orig/Test/test_checker_works.py
++++ cmor-3.2.8/Test/test_checker_works.py
@@ -1,7 +1,7 @@
-####
+# --- Test/test_checker_works.pylint(original)0;95;c####
@@ -1150,10 +1150,10 @@ Index: cmor-3.2.7/Test/test_checker_works.py
pass
else:
raise Exception(
-Index: cmor-3.2.7/Test/test_python_free_wrapping_issue.py
+Index: cmor-3.2.8/Test/test_python_free_wrapping_issue.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_free_wrapping_issue.py
-+++ cmor-3.2.7/Test/test_python_free_wrapping_issue.py
+--- cmor-3.2.8.orig/Test/test_python_free_wrapping_issue.py
++++ cmor-3.2.8/Test/test_python_free_wrapping_issue.py
@@ -2,6 +2,7 @@
# Peter Uhe 24 July 2014
# Martin Dix 21 Nov 2014
@@ -1180,10 +1180,10 @@ Index: cmor-3.2.7/Test/test_python_free_wrapping_issue.py
if __name__ == "__main__":
-Index: cmor-3.2.7/Test/test_python_jamie.py
+Index: cmor-3.2.8/Test/test_python_jamie.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie.py
-+++ cmor-3.2.7/Test/test_python_jamie.py
+--- cmor-3.2.8.orig/Test/test_python_jamie.py
++++ cmor-3.2.8/Test/test_python_jamie.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1198,10 +1198,10 @@ Index: cmor-3.2.7/Test/test_python_jamie.py
if __name__ == '__main__':
-Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim_02.py
+Index: cmor-3.2.8/Test/test_python_joerg_tim2_clim_02.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_tim2_clim_02.py
-+++ cmor-3.2.7/Test/test_python_joerg_tim2_clim_02.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_tim2_clim_02.py
++++ cmor-3.2.8/Test/test_python_joerg_tim2_clim_02.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+from __future__ import print_function
@@ -1223,10 +1223,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim_02.py
values = values.astype("f")
varid = cmor.variable(var,
units,
-Index: cmor-3.2.7/Lib/git2svn.py
+Index: cmor-3.2.8/Lib/git2svn.py
===================================================================
---- cmor-3.2.7.orig/Lib/git2svn.py
-+++ cmor-3.2.7/Lib/git2svn.py
+--- cmor-3.2.8.orig/Lib/git2svn.py
++++ cmor-3.2.8/Lib/git2svn.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os
@@ -1251,10 +1251,10 @@ Index: cmor-3.2.7/Lib/git2svn.py
- print 'svn del :', cmd
+ print ('svn del :', cmd)
os.popen(cmd).readlines()
-Index: cmor-3.2.7/LibCV/pywrapper.py
+Index: cmor-3.2.8/LibCV/pywrapper.py
===================================================================
---- cmor-3.2.7.orig/LibCV/pywrapper.py
-+++ cmor-3.2.7/LibCV/pywrapper.py
+--- cmor-3.2.8.orig/LibCV/pywrapper.py
++++ cmor-3.2.8/LibCV/pywrapper.py
@@ -5,7 +5,7 @@ Created on Fri Feb 19 11:33:52 2016
@author: Denis Nadeau LLNL, Charles Doutriaux LLNL
'''
@@ -1264,20 +1264,20 @@ Index: cmor-3.2.7/LibCV/pywrapper.py
import numpy
import os
import _cmip6_cv
-Index: cmor-3.2.7/LibCV/__init__.py
+Index: cmor-3.2.8/LibCV/__init__.py
===================================================================
---- cmor-3.2.7.orig/LibCV/__init__.py
-+++ cmor-3.2.7/LibCV/__init__.py
+--- cmor-3.2.8.orig/LibCV/__init__.py
++++ cmor-3.2.8/LibCV/__init__.py
@@ -1,3 +1,3 @@
-from cmor_const import *
+from .cmor_const import *
-from pywrapper import setup, load_table, set_table, close, set_cur_dataset_attribute, get_cur_dataset_attribute, has_cur_dataset_attribute, set_variable_attribute, list_variable_attributes, get_variable_attribute, has_variable_attribute, check_institution, check_sourceID, check_experiment, check_grids, check_requiredattributes, check_ISOTime, check_furtherinfourl, get_CV_Error, setup_variable, set_CV_Error, check_parentExpID, check_subExpID, check_filename
+from .pywrapper import setup, load_table, set_table, close, set_cur_dataset_attribute, get_cur_dataset_attribute, has_cur_dataset_attribute, set_variable_attribute, list_variable_attributes, get_variable_attribute, has_variable_attribute, check_institution, check_sourceID, check_experiment, check_grids, check_requiredattributes, check_ISOTime, check_furtherinfourl, get_CV_Error, setup_variable, set_CV_Error, check_parentExpID, check_subExpID, check_filename
-Index: cmor-3.2.7/Test/nc2asc.py
+Index: cmor-3.2.8/Test/nc2asc.py
===================================================================
---- cmor-3.2.7.orig/Test/nc2asc.py
-+++ cmor-3.2.7/Test/nc2asc.py
+--- cmor-3.2.8.orig/Test/nc2asc.py
++++ cmor-3.2.8/Test/nc2asc.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -1375,10 +1375,10 @@ Index: cmor-3.2.7/Test/nc2asc.py
+print (j, s[-1])
f.close()
-Index: cmor-3.2.7/Test/test_python_joerg_10.py
+Index: cmor-3.2.8/Test/test_python_joerg_10.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_10.py
-+++ cmor-3.2.7/Test/test_python_joerg_10.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_10.py
++++ cmor-3.2.8/Test/test_python_joerg_10.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -1430,10 +1430,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_10.py
cmor.write(
myvars[0],
data2d,
-Index: cmor-3.2.7/Test/test_python_joerg_11.py
+Index: cmor-3.2.8/Test/test_python_joerg_11.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_11.py
-+++ cmor-3.2.7/Test/test_python_joerg_11.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_11.py
++++ cmor-3.2.8/Test/test_python_joerg_11.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -1479,10 +1479,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_11.py
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.7/Test/test_python_joerg_12.py
+Index: cmor-3.2.8/Test/test_python_joerg_12.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_12.py
-+++ cmor-3.2.7/Test/test_python_joerg_12.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_12.py
++++ cmor-3.2.8/Test/test_python_joerg_12.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -1528,10 +1528,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_12.py
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.7/Test/test_python_joerg_9.py
+Index: cmor-3.2.8/Test/test_python_joerg_9.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_9.py
-+++ cmor-3.2.7/Test/test_python_joerg_9.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_9.py
++++ cmor-3.2.8/Test/test_python_joerg_9.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1554,10 +1554,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_9.py
+ print ('dumped to:', fnm)
cmor.close()
-Index: cmor-3.2.7/Test/cmor_speed_and_compression_03.py
+Index: cmor-3.2.8/Test/cmor_speed_and_compression_03.py
===================================================================
---- cmor-3.2.7.orig/Test/cmor_speed_and_compression_03.py
-+++ cmor-3.2.7/Test/cmor_speed_and_compression_03.py
+--- cmor-3.2.8.orig/Test/cmor_speed_and_compression_03.py
++++ cmor-3.2.8/Test/cmor_speed_and_compression_03.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1630,10 +1630,10 @@ Index: cmor-3.2.7/Test/cmor_speed_and_compression_03.py
f = open("summary.txt", "w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.7/Test/test_compression.py
+Index: cmor-3.2.8/Test/test_compression.py
===================================================================
---- cmor-3.2.7.orig/Test/test_compression.py
-+++ cmor-3.2.7/Test/test_compression.py
+--- cmor-3.2.8.orig/Test/test_compression.py
++++ cmor-3.2.8/Test/test_compression.py
@@ -1,9 +1,10 @@
+from __future__ import print_function
import sys
@@ -1673,10 +1673,10 @@ Index: cmor-3.2.7/Test/test_compression.py
cmor.write(var_id1, s)
cmor.close(var_id1)
cmor.write(var_id2, s)
-Index: cmor-3.2.7/Test/test_python_2Gb_file.py
+Index: cmor-3.2.8/Test/test_python_2Gb_file.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_2Gb_file.py
-+++ cmor-3.2.7/Test/test_python_2Gb_file.py
+--- cmor-3.2.8.orig/Test/test_python_2Gb_file.py
++++ cmor-3.2.8/Test/test_python_2Gb_file.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1699,10 +1699,10 @@ Index: cmor-3.2.7/Test/test_python_2Gb_file.py
-print 'hello'
+print ('hello')
-Index: cmor-3.2.7/Test/test_python_2Gb_slice.py
+Index: cmor-3.2.8/Test/test_python_2Gb_slice.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_2Gb_slice.py
-+++ cmor-3.2.7/Test/test_python_2Gb_slice.py
+--- cmor-3.2.8.orig/Test/test_python_2Gb_slice.py
++++ cmor-3.2.8/Test/test_python_2Gb_slice.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1747,10 +1747,10 @@ Index: cmor-3.2.7/Test/test_python_2Gb_slice.py
-print 'hello'
+print ('hello')
-Index: cmor-3.2.7/Test/test_python_direct_calls.py
+Index: cmor-3.2.8/Test/test_python_direct_calls.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_direct_calls.py
-+++ cmor-3.2.7/Test/test_python_direct_calls.py
+--- cmor-3.2.8.orig/Test/test_python_direct_calls.py
++++ cmor-3.2.8/Test/test_python_direct_calls.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -1845,10 +1845,10 @@ Index: cmor-3.2.7/Test/test_python_direct_calls.py
cmor._cmor.write(
myvars[0],
numpy.ravel(data2d),
-Index: cmor-3.2.7/Test/test_python_grid_and_ocn_sigma.py
+Index: cmor-3.2.8/Test/test_python_grid_and_ocn_sigma.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_grid_and_ocn_sigma.py
-+++ cmor-3.2.7/Test/test_python_grid_and_ocn_sigma.py
+--- cmor-3.2.8.orig/Test/test_python_grid_and_ocn_sigma.py
++++ cmor-3.2.8/Test/test_python_grid_and_ocn_sigma.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -1954,10 +1954,10 @@ Index: cmor-3.2.7/Test/test_python_grid_and_ocn_sigma.py
cmor.write(ieta,
eta,
1,
-Index: cmor-3.2.7/Test/test_python_index_coord.py
+Index: cmor-3.2.8/Test/test_python_index_coord.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_index_coord.py
-+++ cmor-3.2.7/Test/test_python_index_coord.py
+--- cmor-3.2.8.orig/Test/test_python_index_coord.py
++++ cmor-3.2.8/Test/test_python_index_coord.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -1969,10 +1969,10 @@ Index: cmor-3.2.7/Test/test_python_index_coord.py
f1 = cmor.close(iv, file_name=True)
-print f1
+print (f1)
-Index: cmor-3.2.7/Test/test_python_jamie_11.py
+Index: cmor-3.2.8/Test/test_python_jamie_11.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_11.py
-+++ cmor-3.2.7/Test/test_python_jamie_11.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_11.py
++++ cmor-3.2.8/Test/test_python_jamie_11.py
@@ -1,4 +1,5 @@
#****** Conflict with 'orog' in formula terms *****
+from __future__ import print_function
@@ -1997,10 +1997,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_11.py
var3d_ids = cmor.variable(
table_entry='concdust',
units='kg m-3',
-Index: cmor-3.2.7/Test/test_python_joerg_3.py
+Index: cmor-3.2.8/Test/test_python_joerg_3.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_3.py
-+++ cmor-3.2.7/Test/test_python_joerg_3.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_3.py
++++ cmor-3.2.8/Test/test_python_joerg_3.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2054,10 +2054,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_3.py
-print cmor.close(ivar1, True)
+print (cmor.close(ivar1, True))
cmor.close()
-Index: cmor-3.2.7/Test/test_python_joerg_8.py
+Index: cmor-3.2.8/Test/test_python_joerg_8.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_joerg_8.py
-+++ cmor-3.2.7/Test/test_python_joerg_8.py
+--- cmor-3.2.8.orig/Test/test_python_joerg_8.py
++++ cmor-3.2.8/Test/test_python_joerg_8.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -2103,10 +2103,10 @@ Index: cmor-3.2.7/Test/test_python_joerg_8.py
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.7/Test/test_python_max_variables_2.py
+Index: cmor-3.2.8/Test/test_python_max_variables_2.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_max_variables_2.py
-+++ cmor-3.2.7/Test/test_python_max_variables_2.py
+--- cmor-3.2.8.orig/Test/test_python_max_variables_2.py
++++ cmor-3.2.8/Test/test_python_max_variables_2.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2126,10 +2126,10 @@ Index: cmor-3.2.7/Test/test_python_max_variables_2.py
else:
ierr = cmor.close(var3d_ids, False, True)
-Index: cmor-3.2.7/Test/test_python_open_close_cmor_multiple.py
+Index: cmor-3.2.8/Test/test_python_open_close_cmor_multiple.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_open_close_cmor_multiple.py
-+++ cmor-3.2.7/Test/test_python_open_close_cmor_multiple.py
+--- cmor-3.2.8.orig/Test/test_python_open_close_cmor_multiple.py
++++ cmor-3.2.8/Test/test_python_open_close_cmor_multiple.py
@@ -1,4 +1,4 @@
-
+from __future__ import print_function
@@ -2148,10 +2148,10 @@ Index: cmor-3.2.7/Test/test_python_open_close_cmor_multiple.py
-print 'hello'
+print ('hello')
-Index: cmor-3.2.7/Test/test_python_singleton_anywhere_in_table_def.py
+Index: cmor-3.2.8/Test/test_python_singleton_anywhere_in_table_def.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_singleton_anywhere_in_table_def.py
-+++ cmor-3.2.7/Test/test_python_singleton_anywhere_in_table_def.py
+--- cmor-3.2.8.orig/Test/test_python_singleton_anywhere_in_table_def.py
++++ cmor-3.2.8/Test/test_python_singleton_anywhere_in_table_def.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-
@@ -2191,10 +2191,10 @@ Index: cmor-3.2.7/Test/test_python_singleton_anywhere_in_table_def.py
- print 'wrote'
+ print ('wrote')
cmor.close()
-Index: cmor-3.2.7/Test/test_python_singleton_string.py
+Index: cmor-3.2.8/Test/test_python_singleton_string.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_singleton_string.py
-+++ cmor-3.2.7/Test/test_python_singleton_string.py
+--- cmor-3.2.8.orig/Test/test_python_singleton_string.py
++++ cmor-3.2.8/Test/test_python_singleton_string.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-
@@ -2235,10 +2235,10 @@ Index: cmor-3.2.7/Test/test_python_singleton_string.py
- print 'wrote'
+ print ('wrote')
cmor.close()
-Index: cmor-3.2.7/Test/test_python_user_interface_01.py
+Index: cmor-3.2.8/Test/test_python_user_interface_01.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_user_interface_01.py
-+++ cmor-3.2.7/Test/test_python_user_interface_01.py
+--- cmor-3.2.8.orig/Test/test_python_user_interface_01.py
++++ cmor-3.2.8/Test/test_python_user_interface_01.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -2275,10 +2275,10 @@ Index: cmor-3.2.7/Test/test_python_user_interface_01.py
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.7/Test/test_python_user_interface_03.py
+Index: cmor-3.2.8/Test/test_python_user_interface_03.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_user_interface_03.py
-+++ cmor-3.2.7/Test/test_python_user_interface_03.py
+--- cmor-3.2.8.orig/Test/test_python_user_interface_03.py
++++ cmor-3.2.8/Test/test_python_user_interface_03.py
@@ -1,13 +1,14 @@
+from __future__ import print_function
import numpy
@@ -2334,10 +2334,10 @@ Index: cmor-3.2.7/Test/test_python_user_interface_03.py
# cmor.close()
-print 'Finito'
+print ('Finito')
-Index: cmor-3.2.7/Test/cmor_speed_and_compression.py
+Index: cmor-3.2.8/Test/cmor_speed_and_compression.py
===================================================================
---- cmor-3.2.7.orig/Test/cmor_speed_and_compression.py
-+++ cmor-3.2.7/Test/cmor_speed_and_compression.py
+--- cmor-3.2.8.orig/Test/cmor_speed_and_compression.py
++++ cmor-3.2.8/Test/cmor_speed_and_compression.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2409,10 +2409,10 @@ Index: cmor-3.2.7/Test/cmor_speed_and_compression.py
f = open("summary.txt", "w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.7/Test/cmor_speed_and_compression_02.py
+Index: cmor-3.2.8/Test/cmor_speed_and_compression_02.py
===================================================================
---- cmor-3.2.7.orig/Test/cmor_speed_and_compression_02.py
-+++ cmor-3.2.7/Test/cmor_speed_and_compression_02.py
+--- cmor-3.2.8.orig/Test/cmor_speed_and_compression_02.py
++++ cmor-3.2.8/Test/cmor_speed_and_compression_02.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2502,10 +2502,10 @@ Index: cmor-3.2.7/Test/cmor_speed_and_compression_02.py
f = open("summary.txt", "w")
f.write(repr(dic))
f.close()
-Index: cmor-3.2.7/Test/test_python_jamie_6.py
+Index: cmor-3.2.8/Test/test_python_jamie_6.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_jamie_6.py
-+++ cmor-3.2.7/Test/test_python_jamie_6.py
+--- cmor-3.2.8.orig/Test/test_python_jamie_6.py
++++ cmor-3.2.8/Test/test_python_jamie_6.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2520,10 +2520,10 @@ Index: cmor-3.2.7/Test/test_python_jamie_6.py
ilev = cmor.axis(
table_entry='standard_sigma',
units='1',
-Index: cmor-3.2.7/Test/test_python_user_interface_00.py
+Index: cmor-3.2.8/Test/test_python_user_interface_00.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_user_interface_00.py
-+++ cmor-3.2.7/Test/test_python_user_interface_00.py
+--- cmor-3.2.8.orig/Test/test_python_user_interface_00.py
++++ cmor-3.2.8/Test/test_python_user_interface_00.py
@@ -1,4 +1,5 @@
-from test_python_common import * # common subroutines
+from __future__ import print_function
@@ -2617,10 +2617,10 @@ Index: cmor-3.2.7/Test/test_python_user_interface_00.py
cmor.write(myvars[0], data2d, 1)
cmor.close()
-Index: cmor-3.2.7/Src/_controlvocabulary.c
+Index: cmor-3.2.8/Src/_controlvocabulary.c
===================================================================
---- cmor-3.2.7.orig/Src/_controlvocabulary.c
-+++ cmor-3.2.7/Src/_controlvocabulary.c
+--- cmor-3.2.8.orig/Src/_controlvocabulary.c
++++ cmor-3.2.8/Src/_controlvocabulary.c
@@ -633,8 +633,52 @@ static PyMethodDef MyExtractMethods[] =
{NULL, NULL} /*sentinel */
};
@@ -2675,10 +2675,10 @@ Index: cmor-3.2.7/Src/_controlvocabulary.c
+ return module;
+#endif
}
-Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
+Index: cmor-3.2.8/LibCV/PrePARE/PrePARE.py
===================================================================
---- cmor-3.2.7.orig/LibCV/PrePARE/PrePARE.py
-+++ cmor-3.2.7/LibCV/PrePARE/PrePARE.py
+--- cmor-3.2.8.orig/LibCV/PrePARE/PrePARE.py
++++ cmor-3.2.8/LibCV/PrePARE/PrePARE.py
@@ -16,6 +16,7 @@ Created on Fri Feb 19 11:33:52 2016
@author: Denis Nadeau LLNL
@@ -2817,7 +2817,7 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
# Verify that attribute value is equal to file attribute
table_value = prepLIST[key]
file_value = self.dictVars[key]
-@@ -350,12 +351,12 @@ class checkCMIP6(object):
+@@ -354,12 +355,12 @@ class checkCMIP6(object):
file_value = str(file_value)
table_value = str(table_value)
if table_value != file_value:
@@ -2836,7 +2836,7 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
cmip6_cv.set_CV_Error()
else:
# That attribute is not in the file
-@@ -367,20 +368,20 @@ class checkCMIP6(object):
+@@ -371,20 +372,20 @@ class checkCMIP6(object):
table_value = table_value[0]
if isinstance(table_value, float):
table_value = "{0:.2g}".format(table_value)
@@ -2867,7 +2867,7 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
# =========================
-@@ -411,7 +412,7 @@ def main():
+@@ -415,7 +416,7 @@ def main():
try:
args = parser.parse_args()
except argparse.ArgumentTypeError as errmsg:
@@ -2876,7 +2876,7 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
return 1
except SystemExit:
return 1
-@@ -420,12 +421,12 @@ def main():
+@@ -424,12 +425,12 @@ def main():
process = checkCMIP6(args)
process.ControlVocab()
except KeyboardInterrupt:
@@ -2895,7 +2895,7 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
sys.exit(-1)
# process.checkActivities()
return(0)
-@@ -436,12 +437,12 @@ if(__name__ == '__main__'):
+@@ -440,12 +441,12 @@ if(__name__ == '__main__'):
sys.exit(main())
except KeyboardInterrupt:
@@ -2914,10 +2914,10 @@ Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
sys.exit(-1)
except BaseException:
sys.exit(-1)
-Index: cmor-3.2.7/Test/test_chunking.py
+Index: cmor-3.2.8/Test/test_chunking.py
===================================================================
---- cmor-3.2.7.orig/Test/test_chunking.py
-+++ cmor-3.2.7/Test/test_chunking.py
+--- cmor-3.2.8.orig/Test/test_chunking.py
++++ cmor-3.2.8/Test/test_chunking.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
@@ -2941,10 +2941,10 @@ Index: cmor-3.2.7/Test/test_chunking.py
# read in data, just one slice
-Index: cmor-3.2.7/Test/test_python_sos_psu_units.py
+Index: cmor-3.2.8/Test/test_python_sos_psu_units.py
===================================================================
---- cmor-3.2.7.orig/Test/test_python_sos_psu_units.py
-+++ cmor-3.2.7/Test/test_python_sos_psu_units.py
+--- cmor-3.2.8.orig/Test/test_python_sos_psu_units.py
++++ cmor-3.2.8/Test/test_python_sos_psu_units.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import cmor
diff --git a/debian/patches/shlib-link.patch b/debian/patches/shlib-link.patch
index 7f8c76c..3879d53 100644
--- a/debian/patches/shlib-link.patch
+++ b/debian/patches/shlib-link.patch
@@ -3,12 +3,12 @@ Description: Bugfix to link libcmor.so.2 against -lossp-uuid
Last-Updated: 2016-12-20
Forwarded: no
-Index: cmor-3.2.5/Makefile.in
+Index: cmor-3.2.8/Makefile.in
===================================================================
---- cmor-3.2.5.orig/Makefile.in
-+++ cmor-3.2.5/Makefile.in
+--- cmor-3.2.8.orig/Makefile.in
++++ cmor-3.2.8/Makefile.in
@@ -1,4 +1,3 @@
--#!/usr/bin/env bash
+-#!/usr/bintenv bash
FC=@FC@
CC=@CC@
CFLAGS=@CFLAGS@
@@ -128,7 +128,7 @@ Index: cmor-3.2.5/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@
-@@ -218,7 +237,7 @@ test_python: python
+@@ -223,7 +242,7 @@ test_python: python
test_case:
@echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
@@ -137,7 +137,7 @@ Index: cmor-3.2.5/Makefile.in
@./${TEST_NAME} ${VERB} < ${INPUT_FILE} ;
@ rm ./${TEST_NAME}
ifeq (@MAKEDEPPYTHON@,python)
-@@ -226,7 +245,7 @@ ifeq (@MAKEDEPPYTHON@,python)
+@@ -231,7 +250,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