[cmor] 143/190: WIP: iterate.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit f3adc904f13d80e75773b4628b37ca9ed6668666
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 12 11:39:41 2013 +0100
WIP: iterate.
---
debian/patches/python3.patch | 88 ++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index c67a7ca..f2179a3 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,42 +3,10 @@ Description: Fixes needed to make code python2/3 compatible. NOTE: INCOMPLETE
Last-Updated: 2013-06-12
Forwarded: no
-Index: cmor-2.8.3/setup.py
-===================================================================
---- cmor-2.8.3.orig/setup.py 2013-06-11 10:55:03.000000000 +0100
-+++ cmor-2.8.3/setup.py 2013-06-11 12:02:51.000000000 +0100
-@@ -3,6 +3,8 @@
- #from numpy.distutils.ccompiler import CCompiler
- import os,sys,string
-
-+from __future__ import print_function
-+
- include_dirs = [numpy.lib.utils.get_include(),"include","include/cdTime"]
-
- library_dirs = [ os.path.join("/usr","lib") ,'.']
-@@ -38,12 +40,12 @@
- ld.append(p)
- include_dirs=ld
-
--print 'Setting up python module with:'
--print 'libraries:',libraries
--print 'libdir:',library_dirs
--print 'incdir',include_dirs
--print 'src:',srcfiles
--print 'macros:',macros
-+print('Setting up python module with:')
-+print('libraries:',libraries)
-+print('libdir:',library_dirs)
-+print('incdir',include_dirs)
-+print('src:',srcfiles)
-+print('macros:',macros)
-
- setup (name = "CMOR",
- version='2.0',
Index: cmor-2.8.3/Lib/git2svn.py
===================================================================
---- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Lib/git2svn.py 2013-06-11 12:18:40.000000000 +0100
+--- cmor-2.8.3.orig/Lib/git2svn.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Lib/git2svn.py 2013-06-12 11:22:35.000000000 +0100
@@ -1,5 +1,7 @@
import os,sys
@@ -68,8 +36,8 @@ Index: cmor-2.8.3/Lib/git2svn.py
os.popen(cmd).readlines()
Index: cmor-2.8.3/Lib/pywrapper.py
===================================================================
---- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Lib/pywrapper.py 2013-06-12 05:42:31.000000000 +0100
+--- cmor-2.8.3.orig/Lib/pywrapper.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Lib/pywrapper.py 2013-06-12 11:22:35.000000000 +0100
@@ -37,25 +37,25 @@
missing_value : scalar that is used to indicate missing data for this variable. It must be the same type as the data that will be passed to cmor_write. This missing_value will in general be replaced by a standard missing_value specified in the MIP table. If there are no missing data, and the user chooses not to declare the missing value, then this argument may be either omitted or assigned the value 'none' (i.e., missing_value='none').
"""
@@ -724,8 +692,8 @@ Index: cmor-2.8.3/Lib/pywrapper.py
if (file_name is False):
Index: cmor-2.8.3/Lib/__init__.py
===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py 2013-06-12 09:28:51.000000000 +0100
+--- cmor-2.8.3.orig/Lib/__init__.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Lib/__init__.py 2013-06-12 11:22:35.000000000 +0100
@@ -1,9 +1,11 @@
from cmor_const import *
@@ -741,8 +709,8 @@ Index: cmor-2.8.3/Lib/__init__.py
pass
Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
===================================================================
---- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-12 09:33:54.000000000 +0100
+--- cmor-2.8.3.orig/Lib/check_CMOR_compliant.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Lib/check_CMOR_compliant.py 2013-06-12 11:22:35.000000000 +0100
@@ -8,6 +8,8 @@
import time
VERBOSE=-999
@@ -934,8 +902,8 @@ Index: cmor-2.8.3/Lib/check_CMOR_compliant.py
mid=cdtime.reltime(ax[ib],ax.units).tocomp(c)
Index: cmor-2.8.3/Test/check_results.py
===================================================================
---- cmor-2.8.3.orig/Test/check_results.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Test/check_results.py 2013-06-12 09:50:00.000000000 +0100
+--- cmor-2.8.3.orig/Test/check_results.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Test/check_results.py 2013-06-12 11:22:35.000000000 +0100
@@ -2,6 +2,8 @@
from in_files import input_tables
import sys,os
@@ -989,8 +957,8 @@ Index: cmor-2.8.3/Test/check_results.py
+ raise CMORResultCheckError(["Error checking output files for test: Test/%s.f90 we could only find %i files when %i were expected.\n\n Expected files: \n\t%s\n\nPresent files: \n\t%s\n\nMissing files: \n\t%s\n" % (test,nfiles,len(outfiles),repr(outfiles),repr(gotfiles),repr(missing)),])
Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
===================================================================
---- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-10 22:15:22.000000000 +0100
-+++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-12 10:12:42.000000000 +0100
+--- cmor-2.8.3.orig/Test/cmor_speed_and_compression_01.py 2013-06-12 11:22:35.000000000 +0100
++++ cmor-2.8.3/Test/cmor_speed_and_compression_01.py 2013-06-12 11:22:35.000000000 +0100
@@ -1,11 +1,13 @@
import cmor,numpy,sys,os
+
@@ -1066,3 +1034,35 @@ Index: cmor-2.8.3/Test/cmor_speed_and_compression_01.py
f=open("summary.txt","w")
f.write(repr(dic))
f.close()
+Index: cmor-2.8.3/setup.py
+===================================================================
+--- cmor-2.8.3.orig/setup.py 2013-06-12 11:23:06.000000000 +0100
++++ cmor-2.8.3/setup.py 2013-06-12 11:36:43.000000000 +0100
+@@ -3,6 +3,8 @@
+ #from numpy.distutils.ccompiler import CCompiler
+ import os,sys,string
+
++from __future__ import print_function # Python2/3 agnostic, please
++
+ include_dirs = [numpy.lib.utils.get_include(),"include","include/cdTime"]
+
+ library_dirs = [ os.path.join("/usr","lib") ,'.']
+@@ -38,12 +40,12 @@
+ ld.append(p)
+ include_dirs=ld
+
+-print 'Setting up python module with:'
+-print 'libraries:',libraries
+-print 'libdir:',library_dirs
+-print 'incdir',include_dirs
+-print 'src:',srcfiles
+-print 'macros:',macros
++print('Setting up python module with:')
++print('libraries:',libraries)
++print('libdir:',library_dirs)
++print('incdir',include_dirs)
++print('src:',srcfiles)
++print('macros:',macros)
+
+ setup (name = "CMOR",
+ version='2.0',
--
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