Codebase list cmor / 6281452
refresh patches Alastair McKinstry 6 years ago
8 changed file(s) with 317 addition(s) and 317 deletion(s). Raw diff Collapse all Expand all
+5
-5
debian/patches/cmor_ver.patch less more
22 Last-Updated: 2013-06-11
33 Forwarded: no
44
5 Index: cmor-3.2.7/cmor.ver
5 Index: cmor-3.2.8/cmor.ver
66 ===================================================================
77 --- /dev/null
8 +++ cmor-3.2.7/cmor.ver
8 +++ cmor-3.2.8/cmor.ver
99 @@ -0,0 +1,7 @@
1010 +CMOR_2.0.0 {
1111 + global:
1414 + Cd*;
1515 + local: *;
1616 +};
17 Index: cmor-3.2.7/configure.ac
17 Index: cmor-3.2.8/configure.ac
1818 ===================================================================
19 --- cmor-3.2.7.orig/configure.ac
20 +++ cmor-3.2.7/configure.ac
19 --- cmor-3.2.8.orig/configure.ac
20 +++ cmor-3.2.8/configure.ac
2121 @@ -23,7 +23,7 @@ esac
2222 CMOR_VERSION=${PACKAGE_VERSION}" (commit: ${GIT_TAG})"
2323
+3
-3
debian/patches/destdir.patch less more
22 Last-Updated: 2013-06-11
33 Forwarded: no
44
5 Index: cmor-3.2.5/Makefile.in
5 Index: cmor-3.2.8/Makefile.in
66 ===================================================================
7 --- cmor-3.2.5.orig/Makefile.in
8 +++ cmor-3.2.5/Makefile.in
7 --- cmor-3.2.8.orig/Makefile.in
8 +++ cmor-3.2.8/Makefile.in
99 @@ -133,19 +133,19 @@ distclean: clean
1010 @echo "Completely cleaning [$(WHEREAMI)]..."
1111 @rm -f $(DISTFILES)
+6
-6
debian/patches/disable_tests.patch less more
22 Last-Updated: 2016-12-19
33 Forwarded: no
44
5 Index: cmor-3.2.7/Makefile.in
5 Index: cmor-3.2.8/Makefile.in
66 ===================================================================
7 --- cmor-3.2.7.orig/Makefile.in
8 +++ cmor-3.2.7/Makefile.in
9 @@ -268,7 +268,7 @@ test_fortran_old_cmor_tables: cmor Table
7 --- cmor-3.2.8.orig/Makefile.in
8 +++ cmor-3.2.8/Makefile.in
9 @@ -273,7 +273,7 @@ test_fortran_old_cmor_tables: cmor Table
1010 @env TEST_NAME="main_prog" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
1111 @env TEST_NAME="test_any_from_asc_i" INPUT_FILE="Test/tas_mytest_3d_i.input" make test_case_old_cmor_tables
1212 @env TEST_NAME="mytest_4d_r" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
1515 @env TEST_NAME="test_3h" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
1616 @env TEST_NAME="test_dimensionless" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
1717 @env TEST_NAME="test_fortran_example_00" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
18 @@ -277,7 +277,7 @@ test_fortran_old_cmor_tables: cmor Table
18 @@ -282,7 +282,7 @@ test_fortran_old_cmor_tables: cmor Table
1919 @env TEST_NAME="test_region" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
2020 @env TEST_NAME="test_sigma" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
2121 @env TEST_NAME="test_singleton" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
2424 @env TEST_NAME="mytest_4d_r_big_array" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
2525 @env TEST_NAME="mytest_4d_d_big_array_2" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
2626 @env TEST_NAME="mytest_4d_d_big_array_3" INPUT_FILE="Test/noinput" make test_case_old_cmor_tables
27 @@ -312,7 +312,7 @@ test_fortran: cmor
27 @@ -317,7 +317,7 @@ test_fortran: cmor
2828 env TEST_NAME="test_station_data" INPUT_FILE="Test/noinput" make test_case
2929 env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro.txt" make test_case
3030 env TEST_NAME="test_cmor_grid_alejandro" INPUT_FILE="Test/alejandro_1.txt" make test_case
+4
-4
debian/patches/makefile-fix.patch less more
22 Last-Updated: 2010-10-26
33 Forwarded: no
44
5 Index: cmor-3.2.5/Makefile.in
5 Index: cmor-3.2.8/Makefile.in
66 ===================================================================
7 --- cmor-3.2.5.orig/Makefile.in
8 +++ cmor-3.2.5/Makefile.in
9 @@ -251,7 +251,7 @@ test_case_old_cmor_tables:
7 --- cmor-3.2.8.orig/Makefile.in
8 +++ cmor-3.2.8/Makefile.in
9 @@ -256,7 +256,7 @@ test_case_old_cmor_tables:
1010 ifeq (@MAKEDEPPYTHON@,python)
1111 @env TEST_NAME="Test/check_results.py old_cmor_tables_${TEST_NAME}" make test_a_python
1212 endif
+5
-5
debian/patches/pkgconfig.patch less more
22 Last-Updated: 2013-06-10
33 Forwarded: no
44
5 Index: cmor-3.2.5/cmor.pc.in
5 Index: cmor-3.2.8/cmor.pc.in
66 ===================================================================
77 --- /dev/null
8 +++ cmor-3.2.5/cmor.pc.in
8 +++ cmor-3.2.8/cmor.pc.in
99 @@ -0,0 +1,13 @@
1010 +prefix=@prefix@
1111 +exec_prefix=${prefix}
2020 +CFlags: -I${prefix}/include
2121 +CFlags: -I${includedir} -I${includedir}/cdTime
2222 +Requires: udunits netcdf ossp-uuid
23 Index: cmor-3.2.5/configure.ac
23 Index: cmor-3.2.8/configure.ac
2424 ===================================================================
25 --- cmor-3.2.5.orig/configure.ac
26 +++ cmor-3.2.5/configure.ac
25 --- cmor-3.2.8.orig/configure.ac
26 +++ cmor-3.2.8/configure.ac
2727 @@ -183,7 +183,7 @@ if [ test ${with_uuidb} != "-yes" ] ; th
2828 UUIDFLAGS=""
2929 fi
+3
-3
debian/patches/prepare-name.patch less more
0 Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
0 Index: cmor-3.2.8/LibCV/PrePARE/PrePARE.py
11 ===================================================================
2 --- cmor-3.2.7.orig/LibCV/PrePARE/PrePARE.py
3 +++ cmor-3.2.7/LibCV/PrePARE/PrePARE.py
2 --- cmor-3.2.8.orig/LibCV/PrePARE/PrePARE.py
3 +++ cmor-3.2.8/LibCV/PrePARE/PrePARE.py
44 @@ -1,4 +1,4 @@
55 -#!/user/bin/env python
66 +#!/usr/bin/python
+285
-285
debian/patches/python3.patch less more
22 Last-Updated: 2017-09-10
33 Forwarded: no
44
5 Index: cmor-3.2.7/Lib/pywrapper.py
6 ===================================================================
7 --- cmor-3.2.7.orig/Lib/pywrapper.py
8 +++ cmor-3.2.7/Lib/pywrapper.py
5 Index: cmor-3.2.8/Lib/pywrapper.py
6 ===================================================================
7 --- cmor-3.2.8.orig/Lib/pywrapper.py
8 +++ cmor-3.2.8/Lib/pywrapper.py
99 @@ -2,9 +2,9 @@ import numpy
1010 import os
1111 import warnings
3333 if not 'value' in ks or not 'units' in ks:
3434 raise Exception(
3535 "error parameter_names key '%s' dictionary does not contain both 'units' and 'value' keys" %
36 Index: cmor-3.2.7/Test/check_results.py
37 ===================================================================
38 --- cmor-3.2.7.orig/Test/check_results.py
39 +++ cmor-3.2.7/Test/check_results.py
36 Index: cmor-3.2.8/Test/check_results.py
37 ===================================================================
38 --- cmor-3.2.8.orig/Test/check_results.py
39 +++ cmor-3.2.8/Test/check_results.py
4040 @@ -1,5 +1,6 @@
4141 -from out_files import out
4242 -from in_files import input_tables
8282 # os.remove(fnm)
8383 else:
8484 missing.append(fnm)
85 Index: cmor-3.2.7/setup.py.in
86 ===================================================================
87 --- cmor-3.2.7.orig/setup.py.in
88 +++ cmor-3.2.7/setup.py.in
85 Index: cmor-3.2.8/setup.py.in
86 ===================================================================
87 --- cmor-3.2.8.orig/setup.py.in
88 +++ cmor-3.2.8/setup.py.in
8989 @@ -1,3 +1,5 @@
9090 +
9191 +from __future__ import print_function # to be python2/python3 agnostic
111111
112112 setup (name = "CMOR",
113113 version='3.2',
114 Index: cmor-3.2.7/Test/jamie_hybrid_height.py
115 ===================================================================
116 --- cmor-3.2.7.orig/Test/jamie_hybrid_height.py
117 +++ cmor-3.2.7/Test/jamie_hybrid_height.py
114 Index: cmor-3.2.8/Test/jamie_hybrid_height.py
115 ===================================================================
116 --- cmor-3.2.8.orig/Test/jamie_hybrid_height.py
117 +++ cmor-3.2.8/Test/jamie_hybrid_height.py
118118 @@ -1,5 +1,5 @@
119119 #!/usr/bin/env python
120120 -
150150
151151 cmor.close()
152152
153 Index: cmor-3.2.7/Test/test_python_appending.py
154 ===================================================================
155 --- cmor-3.2.7.orig/Test/test_python_appending.py
156 +++ cmor-3.2.7/Test/test_python_appending.py
153 Index: cmor-3.2.8/Test/test_python_appending.py
154 ===================================================================
155 --- cmor-3.2.8.orig/Test/test_python_appending.py
156 +++ cmor-3.2.8/Test/test_python_appending.py
157157 @@ -1,3 +1,4 @@
158158 +from __future__ import print_function
159159 import cmor
221221 cmor.close()
222222 return file
223223
224 @@ -98,7 +99,7 @@ data = numpy.random.random((ntime, 19, n
224 @@ -97,7 +98,7 @@ data = numpy.random.random((ntime, 19, n
225225
226226 f1 = mywrite(data=data[:6], time_vals=numpy.arange(
227227 0, 6, 1), cell_bounds=numpy.arange(0, 7, 1))
231231 6, 12, 1), cell_bounds=numpy.arange(6, 13, 1), append_to=f1)
232232 -print f2
233233 +print (f2)
234 Index: cmor-3.2.7/Test/test_python_bad_date.py
235 ===================================================================
236 --- cmor-3.2.7.orig/Test/test_python_bad_date.py
237 +++ cmor-3.2.7/Test/test_python_bad_date.py
234 Index: cmor-3.2.8/Test/test_python_bad_date.py
235 ===================================================================
236 --- cmor-3.2.8.orig/Test/test_python_bad_date.py
237 +++ cmor-3.2.8/Test/test_python_bad_date.py
238238 @@ -1,3 +1,4 @@
239239 +from __future__ import print_function
240240 import cmor
271271
272272
273273 if __name__ == '__main__':
274 Index: cmor-3.2.7/Test/test_python_bentley_01.py
275 ===================================================================
276 --- cmor-3.2.7.orig/Test/test_python_bentley_01.py
277 +++ cmor-3.2.7/Test/test_python_bentley_01.py
274 Index: cmor-3.2.8/Test/test_python_bentley_01.py
275 ===================================================================
276 --- cmor-3.2.8.orig/Test/test_python_bentley_01.py
277 +++ cmor-3.2.8/Test/test_python_bentley_01.py
278278 @@ -1,3 +1,4 @@
279279 +from __future__ import print_function
280280 import cmor
316316
317317
318318 if __name__ == '__main__':
319 Index: cmor-3.2.7/Test/test_python_bounds_request.py
320 ===================================================================
321 --- cmor-3.2.7.orig/Test/test_python_bounds_request.py
322 +++ cmor-3.2.7/Test/test_python_bounds_request.py
319 Index: cmor-3.2.8/Test/test_python_bounds_request.py
320 ===================================================================
321 --- cmor-3.2.8.orig/Test/test_python_bounds_request.py
322 +++ cmor-3.2.8/Test/test_python_bounds_request.py
323323 @@ -1,3 +1,4 @@
324324 +from __future__ import print_function
325325 import cmor
354354 ilev = cmor.axis(
355355 table_entry="pressure2",
356356 coord_vals=levs,
357 Index: cmor-3.2.7/Test/test_python_cfmip_site_axis_test.py
358 ===================================================================
359 --- cmor-3.2.7.orig/Test/test_python_cfmip_site_axis_test.py
360 +++ cmor-3.2.7/Test/test_python_cfmip_site_axis_test.py
357 Index: cmor-3.2.8/Test/test_python_cfmip_site_axis_test.py
358 ===================================================================
359 --- cmor-3.2.8.orig/Test/test_python_cfmip_site_axis_test.py
360 +++ cmor-3.2.8/Test/test_python_cfmip_site_axis_test.py
361361 @@ -28,6 +28,7 @@ variables:
362362 lev:formula_terms = "a: lev b: b orog: orog";
363363 ...
422422
423423 # Close CMOR.
424424 cmor.close()
425 Index: cmor-3.2.7/Test/test_python_clim_bounds.py
426 ===================================================================
427 --- cmor-3.2.7.orig/Test/test_python_clim_bounds.py
428 +++ cmor-3.2.7/Test/test_python_clim_bounds.py
425 Index: cmor-3.2.8/Test/test_python_clim_bounds.py
426 ===================================================================
427 --- cmor-3.2.8.orig/Test/test_python_clim_bounds.py
428 +++ cmor-3.2.8/Test/test_python_clim_bounds.py
429429 @@ -1,4 +1,5 @@
430430 #!/usr/bin/env python
431431 +from __future__ import print_function
441441 axis_id = cmor.axis(**axis)
442442 axis_ids.append(axis_id)
443443
444 Index: cmor-3.2.7/Test/test_python_clim_bounds_02.py
445 ===================================================================
446 --- cmor-3.2.7.orig/Test/test_python_clim_bounds_02.py
447 +++ cmor-3.2.7/Test/test_python_clim_bounds_02.py
444 Index: cmor-3.2.8/Test/test_python_clim_bounds_02.py
445 ===================================================================
446 --- cmor-3.2.8.orig/Test/test_python_clim_bounds_02.py
447 +++ cmor-3.2.8/Test/test_python_clim_bounds_02.py
448448 @@ -1,4 +1,5 @@
449449 #!/usr/bin/env python
450450 +from __future__ import print_function
460460 axis_id = cmor.axis(**axis)
461461 axis_ids.append(axis_id)
462462
463 Index: cmor-3.2.7/Test/test_python_clim_bounds_03.py
464 ===================================================================
465 --- cmor-3.2.7.orig/Test/test_python_clim_bounds_03.py
466 +++ cmor-3.2.7/Test/test_python_clim_bounds_03.py
463 Index: cmor-3.2.8/Test/test_python_clim_bounds_03.py
464 ===================================================================
465 --- cmor-3.2.8.orig/Test/test_python_clim_bounds_03.py
466 +++ cmor-3.2.8/Test/test_python_clim_bounds_03.py
467467 @@ -1,4 +1,5 @@
468468 #!/usr/bin/env python
469469 +from __future__ import print_function
488488
489489 cmor.write(varid, values) # , ntimes_passed=1)
490490
491 Index: cmor-3.2.7/Test/test_python_clim_bounds_04.py
492 ===================================================================
493 --- cmor-3.2.7.orig/Test/test_python_clim_bounds_04.py
494 +++ cmor-3.2.7/Test/test_python_clim_bounds_04.py
491 Index: cmor-3.2.8/Test/test_python_clim_bounds_04.py
492 ===================================================================
493 --- cmor-3.2.8.orig/Test/test_python_clim_bounds_04.py
494 +++ cmor-3.2.8/Test/test_python_clim_bounds_04.py
495495 @@ -1,4 +1,5 @@
496496 #!/usr/bin/env python
497497 +from __future__ import print_function
507507 axis_id = cmor.axis(**axis)
508508 axis_ids.append(axis_id)
509509
510 Index: cmor-3.2.7/Test/test_python_YYYMMDDHH_exp_fmt.py
511 ===================================================================
512 --- cmor-3.2.7.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
513 +++ cmor-3.2.7/Test/test_python_YYYMMDDHH_exp_fmt.py
510 Index: cmor-3.2.8/Test/test_python_YYYMMDDHH_exp_fmt.py
511 ===================================================================
512 --- cmor-3.2.8.orig/Test/test_python_YYYMMDDHH_exp_fmt.py
513 +++ cmor-3.2.8/Test/test_python_YYYMMDDHH_exp_fmt.py
514514 @@ -1,3 +1,4 @@
515515 +from __future__ import print_function
516516 import cmor
525525
526526
527527 if __name__ == '__main__':
528 Index: cmor-3.2.7/Test/test_python_jamie_10.py
529 ===================================================================
530 --- cmor-3.2.7.orig/Test/test_python_jamie_10.py
531 +++ cmor-3.2.7/Test/test_python_jamie_10.py
528 Index: cmor-3.2.8/Test/test_python_jamie_10.py
529 ===================================================================
530 --- cmor-3.2.8.orig/Test/test_python_jamie_10.py
531 +++ cmor-3.2.8/Test/test_python_jamie_10.py
532532 @@ -1,4 +1,5 @@
533533 #!/usr/bin/env python
534534 +from __future__ import print_function
544544 axis_id = cmor.axis(**axis)
545545 axis_ids.append(axis_id)
546546
547 Index: cmor-3.2.7/Test/test_python_jamie_12.py
548 ===================================================================
549 --- cmor-3.2.7.orig/Test/test_python_jamie_12.py
550 +++ cmor-3.2.7/Test/test_python_jamie_12.py
547 Index: cmor-3.2.8/Test/test_python_jamie_12.py
548 ===================================================================
549 --- cmor-3.2.8.orig/Test/test_python_jamie_12.py
550 +++ cmor-3.2.8/Test/test_python_jamie_12.py
551551 @@ -1,5 +1,5 @@
552552 #!/usr/bin/env python
553553 -
564564 return axis_ids
565565
566566
567 Index: cmor-3.2.7/Test/test_python_jamie_2.py
568 ===================================================================
569 --- cmor-3.2.7.orig/Test/test_python_jamie_2.py
570 +++ cmor-3.2.7/Test/test_python_jamie_2.py
567 Index: cmor-3.2.8/Test/test_python_jamie_2.py
568 ===================================================================
569 --- cmor-3.2.8.orig/Test/test_python_jamie_2.py
570 +++ cmor-3.2.8/Test/test_python_jamie_2.py
571571 @@ -1,3 +1,4 @@
572572 +from __future__ import print_function
573573 import cmor
592592
593593
594594 if __name__ == '__main__':
595 Index: cmor-3.2.7/Test/test_python_jamie_8.py
596 ===================================================================
597 --- cmor-3.2.7.orig/Test/test_python_jamie_8.py
598 +++ cmor-3.2.7/Test/test_python_jamie_8.py
595 Index: cmor-3.2.8/Test/test_python_jamie_8.py
596 ===================================================================
597 --- cmor-3.2.8.orig/Test/test_python_jamie_8.py
598 +++ cmor-3.2.8/Test/test_python_jamie_8.py
599599 @@ -1,5 +1,5 @@
600600 #!/usr/bin/env python
601601 -
626626
627627
628628 def cmor_ini():
629 Index: cmor-3.2.7/Test/test_python_jamie_9.py
630 ===================================================================
631 --- cmor-3.2.7.orig/Test/test_python_jamie_9.py
632 +++ cmor-3.2.7/Test/test_python_jamie_9.py
629 Index: cmor-3.2.8/Test/test_python_jamie_9.py
630 ===================================================================
631 --- cmor-3.2.8.orig/Test/test_python_jamie_9.py
632 +++ cmor-3.2.8/Test/test_python_jamie_9.py
633633 @@ -1,4 +1,5 @@
634634 #!/usr/bin/env python
635635 +from __future__ import print_function
654654 axis_id = cmor.axis(**axis)
655655 axis_ids.append(axis_id)
656656
657 Index: cmor-3.2.7/Test/test_python_jamie_site_surface.py
658 ===================================================================
659 --- cmor-3.2.7.orig/Test/test_python_jamie_site_surface.py
660 +++ cmor-3.2.7/Test/test_python_jamie_site_surface.py
657 Index: cmor-3.2.8/Test/test_python_jamie_site_surface.py
658 ===================================================================
659 --- cmor-3.2.8.orig/Test/test_python_jamie_site_surface.py
660 +++ cmor-3.2.8/Test/test_python_jamie_site_surface.py
661661 @@ -1,3 +1,4 @@
662662 +from __future__ import print_function
663663 import cmor
672672
673673
674674 if __name__ == '__main__':
675 Index: cmor-3.2.7/Test/test_python_joerg_2.py
676 ===================================================================
677 --- cmor-3.2.7.orig/Test/test_python_joerg_2.py
678 +++ cmor-3.2.7/Test/test_python_joerg_2.py
675 Index: cmor-3.2.8/Test/test_python_joerg_2.py
676 ===================================================================
677 --- cmor-3.2.8.orig/Test/test_python_joerg_2.py
678 +++ cmor-3.2.8/Test/test_python_joerg_2.py
679679 @@ -1,4 +1,5 @@
680680 #!/usr/bin/env python
681681 +from __future__ import print_function
709709 if i == 0:
710710 mode = cmor.CMOR_REPLACE
711711 else:
712 Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim.py
713 ===================================================================
714 --- cmor-3.2.7.orig/Test/test_python_joerg_tim2_clim.py
715 +++ cmor-3.2.7/Test/test_python_joerg_tim2_clim.py
712 Index: cmor-3.2.8/Test/test_python_joerg_tim2_clim.py
713 ===================================================================
714 --- cmor-3.2.8.orig/Test/test_python_joerg_tim2_clim.py
715 +++ cmor-3.2.8/Test/test_python_joerg_tim2_clim.py
716716 @@ -1,4 +1,5 @@
717717 #!/usr/bin/env python
718718 +from __future__ import print_function
734734 varid = cmor.variable(var,
735735 units,
736736 axis_ids,
737 Index: cmor-3.2.7/Test/test_python_memory_check.py
738 ===================================================================
739 --- cmor-3.2.7.orig/Test/test_python_memory_check.py
740 +++ cmor-3.2.7/Test/test_python_memory_check.py
737 Index: cmor-3.2.8/Test/test_python_memory_check.py
738 ===================================================================
739 --- cmor-3.2.8.orig/Test/test_python_memory_check.py
740 +++ cmor-3.2.8/Test/test_python_memory_check.py
741741 @@ -5,7 +5,7 @@ Note the memory size from repeated calls
742742
743743 Memory stats are taken from http://code.activestate.com/recipes/286222/
756756
757757 cmor.close(varid)
758758
759 Index: cmor-3.2.7/Test/test_python_reverted_lats.py
760 ===================================================================
761 --- cmor-3.2.7.orig/Test/test_python_reverted_lats.py
762 +++ cmor-3.2.7/Test/test_python_reverted_lats.py
759 Index: cmor-3.2.8/Test/test_python_reverted_lats.py
760 ===================================================================
761 --- cmor-3.2.8.orig/Test/test_python_reverted_lats.py
762 +++ cmor-3.2.8/Test/test_python_reverted_lats.py
763763 @@ -1,3 +1,4 @@
764764 +from __future__ import print_function
765765 import cmor
774774
775775 ivar2 = cmor.variable(
776776 table_entry='tasmin',
777 Index: cmor-3.2.7/Test/test_python_stephanie_6hrPlev_minutes.py
778 ===================================================================
779 --- cmor-3.2.7.orig/Test/test_python_stephanie_6hrPlev_minutes.py
780 +++ cmor-3.2.7/Test/test_python_stephanie_6hrPlev_minutes.py
777 Index: cmor-3.2.8/Test/test_python_stephanie_6hrPlev_minutes.py
778 ===================================================================
779 --- cmor-3.2.8.orig/Test/test_python_stephanie_6hrPlev_minutes.py
780 +++ cmor-3.2.8/Test/test_python_stephanie_6hrPlev_minutes.py
781781 @@ -1,4 +1,5 @@
782782 #!/usr/bin/env python
783783 +from __future__ import print_function
793793 axis_id = cmor.axis(**axis)
794794 axis_ids.append(axis_id)
795795
796 Index: cmor-3.2.7/Lib/cmor_const.py
797 ===================================================================
798 --- cmor-3.2.7.orig/Lib/cmor_const.py
799 +++ cmor-3.2.7/Lib/cmor_const.py
796 Index: cmor-3.2.8/Lib/cmor_const.py
797 ===================================================================
798 --- cmor-3.2.8.orig/Lib/cmor_const.py
799 +++ cmor-3.2.8/Lib/cmor_const.py
800800 @@ -1,4 +1,4 @@
801801 -import _cmor
802802 +from . import _cmor
803803 atts = """
804804 CMOR_MAX_STRING
805805 CMOR_MAX_ELEMENTS
806 Index: cmor-3.2.7/Lib/__init__.py
807 ===================================================================
808 --- cmor-3.2.7.orig/Lib/__init__.py
809 +++ cmor-3.2.7/Lib/__init__.py
806 Index: cmor-3.2.8/Lib/__init__.py
807 ===================================================================
808 --- cmor-3.2.8.orig/Lib/__init__.py
809 +++ cmor-3.2.8/Lib/__init__.py
810810 @@ -4,9 +4,9 @@ xml_pth = os.path.join(sys.prefix, "shar
811811 if os.path.exists(xml_pth):
812812 os.environ["UDUNITS2_XML_PATH"] = xml_pth
827827 + from .check_CMOR_compliant import checkCMOR
828828 except ImportError:
829829 pass
830 Index: cmor-3.2.7/Src/_cmormodule.c
831 ===================================================================
832 --- cmor-3.2.7.orig/Src/_cmormodule.c
833 +++ cmor-3.2.7/Src/_cmormodule.c
830 Index: cmor-3.2.8/Src/_cmormodule.c
831 ===================================================================
832 --- cmor-3.2.8.orig/Src/_cmormodule.c
833 +++ cmor-3.2.8/Src/_cmormodule.c
834834 @@ -3,6 +3,23 @@
835835 #include "numpy/arrayobject.h"
836836 #include "cmor.h"
855855 static PyObject *CMORError;
856856 volatile sig_atomic_t raise_exception = 0;
857857 char *exception_message = "Problem with 'cmor.%s'. Please check the logfile "
858 @@ -399,7 +416,11 @@ static PyObject *PyCMOR_axis(PyObject *
858 @@ -430,7 +447,11 @@ static PyObject *PyCMOR_axis(PyObject *
859859 char *units;
860860 char *interval;
861861 int length;
868868 void *coord_vals;
869869 void *cell_bounds;
870870 int cell_bounds_ndim;
871 @@ -410,12 +431,18 @@ static PyObject *PyCMOR_axis(PyObject *
871 @@ -441,12 +462,18 @@ static PyObject *PyCMOR_axis(PyObject *
872872 /************************************************************************/
873873 /* HUGE assumtion here is that the data is contiguous! */
874874 /************************************************************************/
888888 if (coords_obj == Py_None) {
889889 coord_vals = NULL;
890890 } else {
891 @@ -1036,11 +1063,58 @@ static PyMethodDef MyExtractMethods[] =
891 @@ -1067,11 +1094,58 @@ static PyMethodDef MyExtractMethods[] =
892892 {NULL, NULL} /*sentinel */
893893 };
894894
952952 +#endif
953953 +
954954 }
955 Index: cmor-3.2.7/Test/cmor_speed_and_compression_01.py
956 ===================================================================
957 --- cmor-3.2.7.orig/Test/cmor_speed_and_compression_01.py
958 +++ cmor-3.2.7/Test/cmor_speed_and_compression_01.py
955 Index: cmor-3.2.8/Test/cmor_speed_and_compression_01.py
956 ===================================================================
957 --- cmor-3.2.8.orig/Test/cmor_speed_and_compression_01.py
958 +++ cmor-3.2.8/Test/cmor_speed_and_compression_01.py
959959 @@ -1,3 +1,4 @@
960960 +from __future__ import print_function
961961 import cmor
10281028 f = open("summary.txt", "w")
10291029 f.write(repr(dic))
10301030 f.close()
1031 Index: cmor-3.2.7/Lib/convertCSVFile.py
1032 ===================================================================
1033 --- cmor-3.2.7.orig/Lib/convertCSVFile.py
1034 +++ cmor-3.2.7/Lib/convertCSVFile.py
1031 Index: cmor-3.2.8/Lib/convertCSVFile.py
1032 ===================================================================
1033 --- cmor-3.2.8.orig/Lib/convertCSVFile.py
1034 +++ cmor-3.2.8/Lib/convertCSVFile.py
10351035 @@ -1,3 +1,4 @@
10361036 +from __future__ import print_function
10371037 import csv
10541054 expt = deleteComa(expt)
10551055 -print expt
10561056 +print (expt)
1057 Index: cmor-3.2.7/Test/test_doc.py
1058 ===================================================================
1059 --- cmor-3.2.7.orig/Test/test_doc.py
1060 +++ cmor-3.2.7/Test/test_doc.py
1057 Index: cmor-3.2.8/Test/test_doc.py
1058 ===================================================================
1059 --- cmor-3.2.8.orig/Test/test_doc.py
1060 +++ cmor-3.2.8/Test/test_doc.py
10611061 @@ -1,3 +1,4 @@
10621062 +from __future__ import print_function
10631063 import cmor
10701070 -print "File written: ", outfile
10711071 +print ("File written: ", outfile)
10721072 cmor.close()
1073 Index: cmor-3.2.7/Test/test_non_monotonic_climo_bonds_ok.py
1074 ===================================================================
1075 --- cmor-3.2.7.orig/Test/test_non_monotonic_climo_bonds_ok.py
1076 +++ cmor-3.2.7/Test/test_non_monotonic_climo_bonds_ok.py
1073 Index: cmor-3.2.8/Test/test_non_monotonic_climo_bonds_ok.py
1074 ===================================================================
1075 --- cmor-3.2.8.orig/Test/test_non_monotonic_climo_bonds_ok.py
1076 +++ cmor-3.2.8/Test/test_non_monotonic_climo_bonds_ok.py
10771077 @@ -1,3 +1,4 @@
10781078 +from __future__ import print_function
10791079 import cmor
10881088
10891089
10901090 if __name__ == '__main__':
1091 Index: cmor-3.2.7/Test/test_python_polar_stereo.py
1092 ===================================================================
1093 --- cmor-3.2.7.orig/Test/test_python_polar_stereo.py
1094 +++ cmor-3.2.7/Test/test_python_polar_stereo.py
1091 Index: cmor-3.2.8/Test/test_python_polar_stereo.py
1092 ===================================================================
1093 --- cmor-3.2.8.orig/Test/test_python_polar_stereo.py
1094 +++ cmor-3.2.8/Test/test_python_polar_stereo.py
10951095 @@ -1,5 +1,5 @@
10961096 #!/usr/bin/env python
10971097 -
11171117 myaxes[2] = grid_id
11181118
11191119 mapnm = 'polar_stereographic'
1120 Index: cmor-3.2.7/Test/test_checker_works.py
1121 ===================================================================
1122 --- cmor-3.2.7.orig/Test/test_checker_works.py
1123 +++ cmor-3.2.7/Test/test_checker_works.py
1120 Index: cmor-3.2.8/Test/test_checker_works.py
1121 ===================================================================
1122 --- cmor-3.2.8.orig/Test/test_checker_works.py
1123 +++ cmor-3.2.8/Test/test_checker_works.py
11241124 @@ -1,7 +1,7 @@
11251125 -####
11261126 +# --- Test/test_checker_works.pylint(original)0;95;c####
11491149 pass
11501150 else:
11511151 raise Exception(
1152 Index: cmor-3.2.7/Test/test_python_free_wrapping_issue.py
1153 ===================================================================
1154 --- cmor-3.2.7.orig/Test/test_python_free_wrapping_issue.py
1155 +++ cmor-3.2.7/Test/test_python_free_wrapping_issue.py
1152 Index: cmor-3.2.8/Test/test_python_free_wrapping_issue.py
1153 ===================================================================
1154 --- cmor-3.2.8.orig/Test/test_python_free_wrapping_issue.py
1155 +++ cmor-3.2.8/Test/test_python_free_wrapping_issue.py
11561156 @@ -2,6 +2,7 @@
11571157 # Peter Uhe 24 July 2014
11581158 # Martin Dix 21 Nov 2014
11791179
11801180
11811181 if __name__ == "__main__":
1182 Index: cmor-3.2.7/Test/test_python_jamie.py
1183 ===================================================================
1184 --- cmor-3.2.7.orig/Test/test_python_jamie.py
1185 +++ cmor-3.2.7/Test/test_python_jamie.py
1182 Index: cmor-3.2.8/Test/test_python_jamie.py
1183 ===================================================================
1184 --- cmor-3.2.8.orig/Test/test_python_jamie.py
1185 +++ cmor-3.2.8/Test/test_python_jamie.py
11861186 @@ -1,3 +1,4 @@
11871187 +from __future__ import print_function
11881188 import cmor
11971197
11981198
11991199 if __name__ == '__main__':
1200 Index: cmor-3.2.7/Test/test_python_joerg_tim2_clim_02.py
1201 ===================================================================
1202 --- cmor-3.2.7.orig/Test/test_python_joerg_tim2_clim_02.py
1203 +++ cmor-3.2.7/Test/test_python_joerg_tim2_clim_02.py
1200 Index: cmor-3.2.8/Test/test_python_joerg_tim2_clim_02.py
1201 ===================================================================
1202 --- cmor-3.2.8.orig/Test/test_python_joerg_tim2_clim_02.py
1203 +++ cmor-3.2.8/Test/test_python_joerg_tim2_clim_02.py
12041204 @@ -1,4 +1,5 @@
12051205 #!/usr/bin/env python
12061206 +from __future__ import print_function
12221222 values = values.astype("f")
12231223 varid = cmor.variable(var,
12241224 units,
1225 Index: cmor-3.2.7/Lib/git2svn.py
1226 ===================================================================
1227 --- cmor-3.2.7.orig/Lib/git2svn.py
1228 +++ cmor-3.2.7/Lib/git2svn.py
1225 Index: cmor-3.2.8/Lib/git2svn.py
1226 ===================================================================
1227 --- cmor-3.2.8.orig/Lib/git2svn.py
1228 +++ cmor-3.2.8/Lib/git2svn.py
12291229 @@ -1,3 +1,4 @@
12301230 +from __future__ import print_function
12311231 import os
12501250 - print 'svn del :', cmd
12511251 + print ('svn del :', cmd)
12521252 os.popen(cmd).readlines()
1253 Index: cmor-3.2.7/LibCV/pywrapper.py
1254 ===================================================================
1255 --- cmor-3.2.7.orig/LibCV/pywrapper.py
1256 +++ cmor-3.2.7/LibCV/pywrapper.py
1253 Index: cmor-3.2.8/LibCV/pywrapper.py
1254 ===================================================================
1255 --- cmor-3.2.8.orig/LibCV/pywrapper.py
1256 +++ cmor-3.2.8/LibCV/pywrapper.py
12571257 @@ -5,7 +5,7 @@ Created on Fri Feb 19 11:33:52 2016
12581258 @author: Denis Nadeau LLNL, Charles Doutriaux LLNL
12591259 '''
12631263 import numpy
12641264 import os
12651265 import _cmip6_cv
1266 Index: cmor-3.2.7/LibCV/__init__.py
1267 ===================================================================
1268 --- cmor-3.2.7.orig/LibCV/__init__.py
1269 +++ cmor-3.2.7/LibCV/__init__.py
1266 Index: cmor-3.2.8/LibCV/__init__.py
1267 ===================================================================
1268 --- cmor-3.2.8.orig/LibCV/__init__.py
1269 +++ cmor-3.2.8/LibCV/__init__.py
12701270 @@ -1,3 +1,3 @@
12711271 -from cmor_const import *
12721272 +from .cmor_const import *
12731273
12741274 -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
12751275 +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
1276 Index: cmor-3.2.7/Test/nc2asc.py
1277 ===================================================================
1278 --- cmor-3.2.7.orig/Test/nc2asc.py
1279 +++ cmor-3.2.7/Test/nc2asc.py
1276 Index: cmor-3.2.8/Test/nc2asc.py
1277 ===================================================================
1278 --- cmor-3.2.8.orig/Test/nc2asc.py
1279 +++ cmor-3.2.8/Test/nc2asc.py
12801280 @@ -1,5 +1,6 @@
12811281 #!/usr/bin/env python
12821282
13741374 +print (j, s[-1])
13751375
13761376 f.close()
1377 Index: cmor-3.2.7/Test/test_python_joerg_10.py
1378 ===================================================================
1379 --- cmor-3.2.7.orig/Test/test_python_joerg_10.py
1380 +++ cmor-3.2.7/Test/test_python_joerg_10.py
1377 Index: cmor-3.2.8/Test/test_python_joerg_10.py
1378 ===================================================================
1379 --- cmor-3.2.8.orig/Test/test_python_joerg_10.py
1380 +++ cmor-3.2.8/Test/test_python_joerg_10.py
13811381 @@ -1,4 +1,5 @@
13821382 -from test_python_common import * # common subroutines
13831383 +from __future__ import print_function
14291429 cmor.write(
14301430 myvars[0],
14311431 data2d,
1432 Index: cmor-3.2.7/Test/test_python_joerg_11.py
1433 ===================================================================
1434 --- cmor-3.2.7.orig/Test/test_python_joerg_11.py
1435 +++ cmor-3.2.7/Test/test_python_joerg_11.py
1432 Index: cmor-3.2.8/Test/test_python_joerg_11.py
1433 ===================================================================
1434 --- cmor-3.2.8.orig/Test/test_python_joerg_11.py
1435 +++ cmor-3.2.8/Test/test_python_joerg_11.py
14361436 @@ -1,4 +1,5 @@
14371437 -from test_python_common import * # common subroutines
14381438 +from __future__ import print_function
14781478 cmor.write(myvars[0], data2d, 1, time_vals=Time[i],
14791479 time_bnds=bnds_time[2 * i:2 * i + 2])
14801480 cmor.close()
1481 Index: cmor-3.2.7/Test/test_python_joerg_12.py
1482 ===================================================================
1483 --- cmor-3.2.7.orig/Test/test_python_joerg_12.py
1484 +++ cmor-3.2.7/Test/test_python_joerg_12.py
1481 Index: cmor-3.2.8/Test/test_python_joerg_12.py
1482 ===================================================================
1483 --- cmor-3.2.8.orig/Test/test_python_joerg_12.py
1484 +++ cmor-3.2.8/Test/test_python_joerg_12.py
14851485 @@ -1,4 +1,5 @@
14861486 -from test_python_common import * # common subroutines
14871487 +from __future__ import print_function
15271527 cmor.write(myvars[0], data2d, 1, time_vals=Time[i],
15281528 time_bnds=bnds_time[2 * i:2 * i + 2])
15291529 cmor.close()
1530 Index: cmor-3.2.7/Test/test_python_joerg_9.py
1531 ===================================================================
1532 --- cmor-3.2.7.orig/Test/test_python_joerg_9.py
1533 +++ cmor-3.2.7/Test/test_python_joerg_9.py
1530 Index: cmor-3.2.8/Test/test_python_joerg_9.py
1531 ===================================================================
1532 --- cmor-3.2.8.orig/Test/test_python_joerg_9.py
1533 +++ cmor-3.2.8/Test/test_python_joerg_9.py
15341534 @@ -1,3 +1,4 @@
15351535 +from __future__ import print_function
15361536 import cmor
15531553 + print ('dumped to:', fnm)
15541554
15551555 cmor.close()
1556 Index: cmor-3.2.7/Test/cmor_speed_and_compression_03.py
1557 ===================================================================
1558 --- cmor-3.2.7.orig/Test/cmor_speed_and_compression_03.py
1559 +++ cmor-3.2.7/Test/cmor_speed_and_compression_03.py
1556 Index: cmor-3.2.8/Test/cmor_speed_and_compression_03.py
1557 ===================================================================
1558 --- cmor-3.2.8.orig/Test/cmor_speed_and_compression_03.py
1559 +++ cmor-3.2.8/Test/cmor_speed_and_compression_03.py
15601560 @@ -1,3 +1,4 @@
15611561 +from __future__ import print_function
15621562 import cmor
16291629 f = open("summary.txt", "w")
16301630 f.write(repr(dic))
16311631 f.close()
1632 Index: cmor-3.2.7/Test/test_compression.py
1633 ===================================================================
1634 --- cmor-3.2.7.orig/Test/test_compression.py
1635 +++ cmor-3.2.7/Test/test_compression.py
1632 Index: cmor-3.2.8/Test/test_compression.py
1633 ===================================================================
1634 --- cmor-3.2.8.orig/Test/test_compression.py
1635 +++ cmor-3.2.8/Test/test_compression.py
16361636 @@ -1,9 +1,10 @@
16371637 +from __future__ import print_function
16381638 import sys
16721672 cmor.write(var_id1, s)
16731673 cmor.close(var_id1)
16741674 cmor.write(var_id2, s)
1675 Index: cmor-3.2.7/Test/test_python_2Gb_file.py
1676 ===================================================================
1677 --- cmor-3.2.7.orig/Test/test_python_2Gb_file.py
1678 +++ cmor-3.2.7/Test/test_python_2Gb_file.py
1675 Index: cmor-3.2.8/Test/test_python_2Gb_file.py
1676 ===================================================================
1677 --- cmor-3.2.8.orig/Test/test_python_2Gb_file.py
1678 +++ cmor-3.2.8/Test/test_python_2Gb_file.py
16791679 @@ -1,4 +1,4 @@
16801680 -
16811681 +from __future__ import print_function
16981698
16991699 -print 'hello'
17001700 +print ('hello')
1701 Index: cmor-3.2.7/Test/test_python_2Gb_slice.py
1702 ===================================================================
1703 --- cmor-3.2.7.orig/Test/test_python_2Gb_slice.py
1704 +++ cmor-3.2.7/Test/test_python_2Gb_slice.py
1701 Index: cmor-3.2.8/Test/test_python_2Gb_slice.py
1702 ===================================================================
1703 --- cmor-3.2.8.orig/Test/test_python_2Gb_slice.py
1704 +++ cmor-3.2.8/Test/test_python_2Gb_slice.py
17051705 @@ -1,4 +1,4 @@
17061706 -
17071707 +from __future__ import print_function
17461746
17471747 -print 'hello'
17481748 +print ('hello')
1749 Index: cmor-3.2.7/Test/test_python_direct_calls.py
1750 ===================================================================
1751 --- cmor-3.2.7.orig/Test/test_python_direct_calls.py
1752 +++ cmor-3.2.7/Test/test_python_direct_calls.py
1749 Index: cmor-3.2.8/Test/test_python_direct_calls.py
1750 ===================================================================
1751 --- cmor-3.2.8.orig/Test/test_python_direct_calls.py
1752 +++ cmor-3.2.8/Test/test_python_direct_calls.py
17531753 @@ -1,4 +1,5 @@
17541754 -from test_python_common import * # common subroutines
17551755 +from __future__ import print_function
18441844 cmor._cmor.write(
18451845 myvars[0],
18461846 numpy.ravel(data2d),
1847 Index: cmor-3.2.7/Test/test_python_grid_and_ocn_sigma.py
1848 ===================================================================
1849 --- cmor-3.2.7.orig/Test/test_python_grid_and_ocn_sigma.py
1850 +++ cmor-3.2.7/Test/test_python_grid_and_ocn_sigma.py
1847 Index: cmor-3.2.8/Test/test_python_grid_and_ocn_sigma.py
1848 ===================================================================
1849 --- cmor-3.2.8.orig/Test/test_python_grid_and_ocn_sigma.py
1850 +++ cmor-3.2.8/Test/test_python_grid_and_ocn_sigma.py
18511851 @@ -1,4 +1,4 @@
18521852 -
18531853 +from __future__ import print_function
19531953 cmor.write(ieta,
19541954 eta,
19551955 1,
1956 Index: cmor-3.2.7/Test/test_python_index_coord.py
1957 ===================================================================
1958 --- cmor-3.2.7.orig/Test/test_python_index_coord.py
1959 +++ cmor-3.2.7/Test/test_python_index_coord.py
1956 Index: cmor-3.2.8/Test/test_python_index_coord.py
1957 ===================================================================
1958 --- cmor-3.2.8.orig/Test/test_python_index_coord.py
1959 +++ cmor-3.2.8/Test/test_python_index_coord.py
19601960 @@ -1,3 +1,4 @@
19611961 +from __future__ import print_function
19621962 import cmor
19681968 f1 = cmor.close(iv, file_name=True)
19691969 -print f1
19701970 +print (f1)
1971 Index: cmor-3.2.7/Test/test_python_jamie_11.py
1972 ===================================================================
1973 --- cmor-3.2.7.orig/Test/test_python_jamie_11.py
1974 +++ cmor-3.2.7/Test/test_python_jamie_11.py
1971 Index: cmor-3.2.8/Test/test_python_jamie_11.py
1972 ===================================================================
1973 --- cmor-3.2.8.orig/Test/test_python_jamie_11.py
1974 +++ cmor-3.2.8/Test/test_python_jamie_11.py
19751975 @@ -1,4 +1,5 @@
19761976 #****** Conflict with 'orog' in formula terms *****
19771977 +from __future__ import print_function
19961996 var3d_ids = cmor.variable(
19971997 table_entry='concdust',
19981998 units='kg m-3',
1999 Index: cmor-3.2.7/Test/test_python_joerg_3.py
2000 ===================================================================
2001 --- cmor-3.2.7.orig/Test/test_python_joerg_3.py
2002 +++ cmor-3.2.7/Test/test_python_joerg_3.py
1999 Index: cmor-3.2.8/Test/test_python_joerg_3.py
2000 ===================================================================
2001 --- cmor-3.2.8.orig/Test/test_python_joerg_3.py
2002 +++ cmor-3.2.8/Test/test_python_joerg_3.py
20032003 @@ -1,3 +1,4 @@
20042004 +from __future__ import print_function
20052005 import cmor
20532053 -print cmor.close(ivar1, True)
20542054 +print (cmor.close(ivar1, True))
20552055 cmor.close()
2056 Index: cmor-3.2.7/Test/test_python_joerg_8.py
2057 ===================================================================
2058 --- cmor-3.2.7.orig/Test/test_python_joerg_8.py
2059 +++ cmor-3.2.7/Test/test_python_joerg_8.py
2056 Index: cmor-3.2.8/Test/test_python_joerg_8.py
2057 ===================================================================
2058 --- cmor-3.2.8.orig/Test/test_python_joerg_8.py
2059 +++ cmor-3.2.8/Test/test_python_joerg_8.py
20602060 @@ -1,4 +1,5 @@
20612061 -from test_python_common import * # common subroutines
20622062 +from __future__ import print_function
21022102 cmor.write(myvars[0], data2d, 1, time_vals=Time[i],
21032103 time_bnds=bnds_time[2 * i:2 * i + 2])
21042104 cmor.close()
2105 Index: cmor-3.2.7/Test/test_python_max_variables_2.py
2106 ===================================================================
2107 --- cmor-3.2.7.orig/Test/test_python_max_variables_2.py
2108 +++ cmor-3.2.7/Test/test_python_max_variables_2.py
2105 Index: cmor-3.2.8/Test/test_python_max_variables_2.py
2106 ===================================================================
2107 --- cmor-3.2.8.orig/Test/test_python_max_variables_2.py
2108 +++ cmor-3.2.8/Test/test_python_max_variables_2.py
21092109 @@ -1,3 +1,4 @@
21102110 +from __future__ import print_function
21112111 import cmor
21252125 else:
21262126 ierr = cmor.close(var3d_ids, False, True)
21272127
2128 Index: cmor-3.2.7/Test/test_python_open_close_cmor_multiple.py
2129 ===================================================================
2130 --- cmor-3.2.7.orig/Test/test_python_open_close_cmor_multiple.py
2131 +++ cmor-3.2.7/Test/test_python_open_close_cmor_multiple.py
2128 Index: cmor-3.2.8/Test/test_python_open_close_cmor_multiple.py
2129 ===================================================================
2130 --- cmor-3.2.8.orig/Test/test_python_open_close_cmor_multiple.py
2131 +++ cmor-3.2.8/Test/test_python_open_close_cmor_multiple.py
21322132 @@ -1,4 +1,4 @@
21332133 -
21342134 +from __future__ import print_function
21472147
21482148 -print 'hello'
21492149 +print ('hello')
2150 Index: cmor-3.2.7/Test/test_python_singleton_anywhere_in_table_def.py
2151 ===================================================================
2152 --- cmor-3.2.7.orig/Test/test_python_singleton_anywhere_in_table_def.py
2153 +++ cmor-3.2.7/Test/test_python_singleton_anywhere_in_table_def.py
2150 Index: cmor-3.2.8/Test/test_python_singleton_anywhere_in_table_def.py
2151 ===================================================================
2152 --- cmor-3.2.8.orig/Test/test_python_singleton_anywhere_in_table_def.py
2153 +++ cmor-3.2.8/Test/test_python_singleton_anywhere_in_table_def.py
21542154 @@ -1,6 +1,6 @@
21552155 #!/usr/bin/env python
21562156 -
21902190 - print 'wrote'
21912191 + print ('wrote')
21922192 cmor.close()
2193 Index: cmor-3.2.7/Test/test_python_singleton_string.py
2194 ===================================================================
2195 --- cmor-3.2.7.orig/Test/test_python_singleton_string.py
2196 +++ cmor-3.2.7/Test/test_python_singleton_string.py
2193 Index: cmor-3.2.8/Test/test_python_singleton_string.py
2194 ===================================================================
2195 --- cmor-3.2.8.orig/Test/test_python_singleton_string.py
2196 +++ cmor-3.2.8/Test/test_python_singleton_string.py
21972197 @@ -1,6 +1,6 @@
21982198 #!/usr/bin/env python
21992199 -
22342234 - print 'wrote'
22352235 + print ('wrote')
22362236 cmor.close()
2237 Index: cmor-3.2.7/Test/test_python_user_interface_01.py
2238 ===================================================================
2239 --- cmor-3.2.7.orig/Test/test_python_user_interface_01.py
2240 +++ cmor-3.2.7/Test/test_python_user_interface_01.py
2237 Index: cmor-3.2.8/Test/test_python_user_interface_01.py
2238 ===================================================================
2239 --- cmor-3.2.8.orig/Test/test_python_user_interface_01.py
2240 +++ cmor-3.2.8/Test/test_python_user_interface_01.py
22412241 @@ -1,4 +1,5 @@
22422242 -from test_python_common import * # common subroutines
22432243 +from __future__ import print_function
22742274 cmor.write(myvars[0], data2d, 1, time_vals=Time[i],
22752275 time_bnds=bnds_time[2 * i:2 * i + 2])
22762276 cmor.close()
2277 Index: cmor-3.2.7/Test/test_python_user_interface_03.py
2278 ===================================================================
2279 --- cmor-3.2.7.orig/Test/test_python_user_interface_03.py
2280 +++ cmor-3.2.7/Test/test_python_user_interface_03.py
2277 Index: cmor-3.2.8/Test/test_python_user_interface_03.py
2278 ===================================================================
2279 --- cmor-3.2.8.orig/Test/test_python_user_interface_03.py
2280 +++ cmor-3.2.8/Test/test_python_user_interface_03.py
22812281 @@ -1,13 +1,14 @@
22822282 +from __future__ import print_function
22832283 import numpy
23332333 # cmor.close()
23342334 -print 'Finito'
23352335 +print ('Finito')
2336 Index: cmor-3.2.7/Test/cmor_speed_and_compression.py
2337 ===================================================================
2338 --- cmor-3.2.7.orig/Test/cmor_speed_and_compression.py
2339 +++ cmor-3.2.7/Test/cmor_speed_and_compression.py
2336 Index: cmor-3.2.8/Test/cmor_speed_and_compression.py
2337 ===================================================================
2338 --- cmor-3.2.8.orig/Test/cmor_speed_and_compression.py
2339 +++ cmor-3.2.8/Test/cmor_speed_and_compression.py
23402340 @@ -1,3 +1,4 @@
23412341 +from __future__ import print_function
23422342 import cmor
24082408 f = open("summary.txt", "w")
24092409 f.write(repr(dic))
24102410 f.close()
2411 Index: cmor-3.2.7/Test/cmor_speed_and_compression_02.py
2412 ===================================================================
2413 --- cmor-3.2.7.orig/Test/cmor_speed_and_compression_02.py
2414 +++ cmor-3.2.7/Test/cmor_speed_and_compression_02.py
2411 Index: cmor-3.2.8/Test/cmor_speed_and_compression_02.py
2412 ===================================================================
2413 --- cmor-3.2.8.orig/Test/cmor_speed_and_compression_02.py
2414 +++ cmor-3.2.8/Test/cmor_speed_and_compression_02.py
24152415 @@ -1,3 +1,4 @@
24162416 +from __future__ import print_function
24172417 import cmor
25012501 f = open("summary.txt", "w")
25022502 f.write(repr(dic))
25032503 f.close()
2504 Index: cmor-3.2.7/Test/test_python_jamie_6.py
2505 ===================================================================
2506 --- cmor-3.2.7.orig/Test/test_python_jamie_6.py
2507 +++ cmor-3.2.7/Test/test_python_jamie_6.py
2504 Index: cmor-3.2.8/Test/test_python_jamie_6.py
2505 ===================================================================
2506 --- cmor-3.2.8.orig/Test/test_python_jamie_6.py
2507 +++ cmor-3.2.8/Test/test_python_jamie_6.py
25082508 @@ -1,3 +1,4 @@
25092509 +from __future__ import print_function
25102510 import cmor
25192519 ilev = cmor.axis(
25202520 table_entry='standard_sigma',
25212521 units='1',
2522 Index: cmor-3.2.7/Test/test_python_user_interface_00.py
2523 ===================================================================
2524 --- cmor-3.2.7.orig/Test/test_python_user_interface_00.py
2525 +++ cmor-3.2.7/Test/test_python_user_interface_00.py
2522 Index: cmor-3.2.8/Test/test_python_user_interface_00.py
2523 ===================================================================
2524 --- cmor-3.2.8.orig/Test/test_python_user_interface_00.py
2525 +++ cmor-3.2.8/Test/test_python_user_interface_00.py
25262526 @@ -1,4 +1,5 @@
25272527 -from test_python_common import * # common subroutines
25282528 +from __future__ import print_function
26162616 cmor.write(myvars[0], data2d, 1)
26172617
26182618 cmor.close()
2619 Index: cmor-3.2.7/Src/_controlvocabulary.c
2620 ===================================================================
2621 --- cmor-3.2.7.orig/Src/_controlvocabulary.c
2622 +++ cmor-3.2.7/Src/_controlvocabulary.c
2619 Index: cmor-3.2.8/Src/_controlvocabulary.c
2620 ===================================================================
2621 --- cmor-3.2.8.orig/Src/_controlvocabulary.c
2622 +++ cmor-3.2.8/Src/_controlvocabulary.c
26232623 @@ -633,8 +633,52 @@ static PyMethodDef MyExtractMethods[] =
26242624 {NULL, NULL} /*sentinel */
26252625 };
26742674 + return module;
26752675 +#endif
26762676 }
2677 Index: cmor-3.2.7/LibCV/PrePARE/PrePARE.py
2678 ===================================================================
2679 --- cmor-3.2.7.orig/LibCV/PrePARE/PrePARE.py
2680 +++ cmor-3.2.7/LibCV/PrePARE/PrePARE.py
2677 Index: cmor-3.2.8/LibCV/PrePARE/PrePARE.py
2678 ===================================================================
2679 --- cmor-3.2.8.orig/LibCV/PrePARE/PrePARE.py
2680 +++ cmor-3.2.8/LibCV/PrePARE/PrePARE.py
26812681 @@ -16,6 +16,7 @@ Created on Fri Feb 19 11:33:52 2016
26822682
26832683 @author: Denis Nadeau LLNL
28162816 # Verify that attribute value is equal to file attribute
28172817 table_value = prepLIST[key]
28182818 file_value = self.dictVars[key]
2819 @@ -350,12 +351,12 @@ class checkCMIP6(object):
2819 @@ -354,12 +355,12 @@ class checkCMIP6(object):
28202820 file_value = str(file_value)
28212821 table_value = str(table_value)
28222822 if table_value != file_value:
28352835 cmip6_cv.set_CV_Error()
28362836 else:
28372837 # That attribute is not in the file
2838 @@ -367,20 +368,20 @@ class checkCMIP6(object):
2838 @@ -371,20 +372,20 @@ class checkCMIP6(object):
28392839 table_value = table_value[0]
28402840 if isinstance(table_value, float):
28412841 table_value = "{0:.2g}".format(table_value)
28662866
28672867
28682868 # =========================
2869 @@ -411,7 +412,7 @@ def main():
2869 @@ -415,7 +416,7 @@ def main():
28702870 try:
28712871 args = parser.parse_args()
28722872 except argparse.ArgumentTypeError as errmsg:
28752875 return 1
28762876 except SystemExit:
28772877 return 1
2878 @@ -420,12 +421,12 @@ def main():
2878 @@ -424,12 +425,12 @@ def main():
28792879 process = checkCMIP6(args)
28802880 process.ControlVocab()
28812881 except KeyboardInterrupt:
28942894 sys.exit(-1)
28952895 # process.checkActivities()
28962896 return(0)
2897 @@ -436,12 +437,12 @@ if(__name__ == '__main__'):
2897 @@ -440,12 +441,12 @@ if(__name__ == '__main__'):
28982898 sys.exit(main())
28992899
29002900 except KeyboardInterrupt:
29132913 sys.exit(-1)
29142914 except BaseException:
29152915 sys.exit(-1)
2916 Index: cmor-3.2.7/Test/test_chunking.py
2917 ===================================================================
2918 --- cmor-3.2.7.orig/Test/test_chunking.py
2919 +++ cmor-3.2.7/Test/test_chunking.py
2916 Index: cmor-3.2.8/Test/test_chunking.py
2917 ===================================================================
2918 --- cmor-3.2.8.orig/Test/test_chunking.py
2919 +++ cmor-3.2.8/Test/test_chunking.py
29202920 @@ -1,3 +1,4 @@
29212921 +from __future__ import print_function
29222922 import cmor
29402940
29412941
29422942 # read in data, just one slice
2943 Index: cmor-3.2.7/Test/test_python_sos_psu_units.py
2944 ===================================================================
2945 --- cmor-3.2.7.orig/Test/test_python_sos_psu_units.py
2946 +++ cmor-3.2.7/Test/test_python_sos_psu_units.py
2943 Index: cmor-3.2.8/Test/test_python_sos_psu_units.py
2944 ===================================================================
2945 --- cmor-3.2.8.orig/Test/test_python_sos_psu_units.py
2946 +++ cmor-3.2.8/Test/test_python_sos_psu_units.py
29472947 @@ -1,3 +1,4 @@
29482948 +from __future__ import print_function
29492949 import cmor
+6
-6
debian/patches/shlib-link.patch less more
22 Last-Updated: 2016-12-20
33 Forwarded: no
44
5 Index: cmor-3.2.5/Makefile.in
5 Index: cmor-3.2.8/Makefile.in
66 ===================================================================
7 --- cmor-3.2.5.orig/Makefile.in
8 +++ cmor-3.2.5/Makefile.in
7 --- cmor-3.2.8.orig/Makefile.in
8 +++ cmor-3.2.8/Makefile.in
99 @@ -1,4 +1,3 @@
10 -#!/usr/bin/env bash
10 -#!/usr/bintenv bash
1111 FC=@FC@
1212 CC=@CC@
1313 CFLAGS=@CFLAGS@
127127 cmor_fortran_interface.o: Src/cmor_fortran_interface.f90
128128 ${FC} -c ${FCFLAGS} ${USERFFLAGS} ${DEBUG} ${MACROS} Src/cmor_fortran_interface.f90
129129 cmor: $(LIBFILES) @MAKEDEPPYTHON@
130 @@ -218,7 +237,7 @@ test_python: python
130 @@ -223,7 +242,7 @@ test_python: python
131131
132132 test_case:
133133 @echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
136136 @./${TEST_NAME} ${VERB} < ${INPUT_FILE} ;
137137 @ rm ./${TEST_NAME}
138138 ifeq (@MAKEDEPPYTHON@,python)
139 @@ -226,7 +245,7 @@ ifeq (@MAKEDEPPYTHON@,python)
139 @@ -231,7 +250,7 @@ ifeq (@MAKEDEPPYTHON@,python)
140140 endif
141141 test_case_old_cmor_tables:
142142 @echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}