[pyferret] 56/110: update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 08:42: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 pyferret.
commit a5a579468393ae227d7d50d4478ed92bd281a643
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Aug 9 14:28:01 2016 +0100
update patches
---
debian/patches/python3.patch | 641 +++++++++++++++++++++++++-------------
debian/patches/reproducible.patch | 14 +
2 files changed, 430 insertions(+), 225 deletions(-)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 9bd3267..184e318 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Support Python3
Last-Updated: 2015-10-30
Forwarded: no
-Index: pyferret-1.1.0/ferretmagic.py
+Index: pyferret-1.2.0/ferretmagic.py
===================================================================
---- pyferret-1.1.0.orig/ferretmagic.py
-+++ pyferret-1.1.0/ferretmagic.py
+--- pyferret-1.2.0.orig/ferretmagic.py
++++ pyferret-1.2.0/ferretmagic.py
@@ -48,6 +48,7 @@ Usage
# https://cdcvs.fnal.gov/redmine/projects/ipython_ext/repository/revisions/master/raw/ipythonPexpect.py
#-----------------------------------------------------------------------------
@@ -35,10 +35,10 @@ Index: pyferret-1.1.0/ferretmagic.py
# Let's rewrite InteractiveShell.run_cell to do automatic processing with pyferret,
# if desired
-Index: pyferret-1.1.0/gcircle.py
+Index: pyferret-1.2.0/gcircle.py
===================================================================
---- pyferret-1.1.0.orig/gcircle.py
-+++ pyferret-1.1.0/gcircle.py
+--- pyferret-1.2.0.orig/gcircle.py
++++ pyferret-1.2.0/gcircle.py
@@ -4,9 +4,11 @@ Module of functions involving great circ
with points given in longitudes and latitudes.
"""
@@ -226,10 +226,10 @@ Index: pyferret-1.1.0/gcircle.py
- print
+ print ("Equidistscatter region PASS")
+ print ()
-Index: pyferret-1.1.0/pyfermod/filenamecompleter.py
+Index: pyferret-1.2.0/pyfermod/filenamecompleter.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/filenamecompleter.py
-+++ pyferret-1.1.0/pyfermod/filenamecompleter.py
+--- pyferret-1.2.0.orig/pyfermod/filenamecompleter.py
++++ pyferret-1.2.0/pyfermod/filenamecompleter.py
@@ -9,6 +9,7 @@ be names of existing files that match th
directory/file name.
"""
@@ -312,10 +312,10 @@ Index: pyferret-1.1.0/pyfermod/filenamecompleter.py
+ print ('')
+ print ('Success')
-Index: pyferret-1.1.0/pviewmod/__init__.py
+Index: pyferret-1.2.0/pviewmod/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pviewmod/__init__.py
-+++ pyferret-1.1.0/pviewmod/__init__.py
+--- pyferret-1.2.0.orig/pviewmod/__init__.py
++++ pyferret-1.2.0/pviewmod/__init__.py
@@ -8,6 +8,8 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -342,39 +342,10 @@ Index: pyferret-1.1.0/pviewmod/__init__.py
except ImportError:
raise TypeError("The PQ viewers requires PyQt4")
self.__vprocess = PipedImagerPQProcess(self.__cmndrecvpipe,
-@@ -222,23 +224,23 @@ if __name__ == "__main__":
- drawcmnds.append( { "action":"exit" } )
- # Test each known viewer.
- for viewername in ( "PipedViewerPQ", ):
-- print "Testing Viewer %s" % viewername
-+ print ("Testing Viewer %s" % viewername)
- # create the viewer
- pviewer = PipedViewer(viewername)
- # submit the commands, pausing after each "show" command
- for cmd in drawcmnds:
-- print "Command: %s" % str(cmd)
-+ print ("Command: %s" % str(cmd))
- pviewer.submitCommand(cmd)
- response = pviewer.checkForResponse()
- while response:
-- print "Response: %s" % str(response)
-+ print ("Response: %s" % str(response))
- response = pviewer.checkForResponse()
- if cmd["action"] == "show":
-- raw_input("Press Enter to continue")
-+ input("Press Enter to continue")
- # end of the commands - shut down and check return value
- pviewer.waitForViewerExit()
- result = pviewer.getViewerExitCode()
- if result != 0:
- sys.exit(result)
- else:
-- print "Done with %s" % viewername
-+ print ("Done with %s" % viewername)
-Index: pyferret-1.1.0/pviewmod/pyferretbindings.py
+Index: pyferret-1.2.0/pviewmod/pyferretbindings.py
===================================================================
---- pyferret-1.1.0.orig/pviewmod/pyferretbindings.py
-+++ pyferret-1.1.0/pviewmod/pyferretbindings.py
+--- pyferret-1.2.0.orig/pviewmod/pyferretbindings.py
++++ pyferret-1.2.0/pviewmod/pyferretbindings.py
@@ -15,9 +15,11 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -388,7 +359,7 @@ Index: pyferret-1.1.0/pviewmod/pyferretbindings.py
class PyFerretBindings(AbstractPyFerretBindings):
'''
-@@ -884,7 +886,7 @@ if __name__ == "__main__":
+@@ -931,7 +933,7 @@ if __name__ == "__main__":
# Initiate pyferret, but stay in python
pyferret.init(None, False)
for viewertype in ( "PipedViewerPQ", ):
@@ -396,8 +367,8 @@ Index: pyferret-1.1.0/pviewmod/pyferretbindings.py
+ print ("Testing bindings for %s" % viewertype)
# Create a viewer window
title = viewertype + "Tester"
- bindinst = pyferret.graphbind.createWindow(viewertype, title, True)
-@@ -920,7 +922,7 @@ if __name__ == "__main__":
+ bindinst = pyferret.graphbind.createWindow(viewertype, title, True, False)
+@@ -967,7 +969,7 @@ if __name__ == "__main__":
bindinst.endView()
# Window should already be shown, but just to make sure
bindinst.showWindow(True)
@@ -406,7 +377,7 @@ Index: pyferret-1.1.0/pviewmod/pyferretbindings.py
# Create a view of the whole window
bindinst.beginView(0.0, 1.0, 1.0, 0.0, True)
# Draw magenta points using various symbols
-@@ -963,7 +965,7 @@ if __name__ == "__main__":
+@@ -1010,7 +1012,7 @@ if __name__ == "__main__":
bindinst.endView()
# Window should already be shown, but just to make sure
bindinst.showWindow(True)
@@ -415,17 +386,17 @@ Index: pyferret-1.1.0/pviewmod/pyferretbindings.py
try:
while 1:
bindinst.deleteColor(mycolors.pop())
-@@ -971,5 +973,5 @@ if __name__ == "__main__":
+@@ -1018,5 +1020,5 @@ if __name__ == "__main__":
pass
bindinst.deleteFont(myfont)
bindinst.deleteWindow()
- print "Done with bindings for %s" % viewertype
+ print ("Done with bindings for %s" % viewertype)
-Index: pyferret-1.1.0/pviewmod/scaledialogpq.py
+Index: pyferret-1.2.0/pviewmod/scaledialogpq.py
===================================================================
---- pyferret-1.1.0.orig/pviewmod/scaledialogpq.py
-+++ pyferret-1.1.0/pviewmod/scaledialogpq.py
+--- pyferret-1.2.0.orig/pviewmod/scaledialogpq.py
++++ pyferret-1.2.0/pviewmod/scaledialogpq.py
@@ -6,6 +6,7 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -444,10 +415,19 @@ Index: pyferret-1.1.0/pviewmod/scaledialogpq.py
rettuple = resizedialog.getValues()
- print "getValues returned: %s" % str(rettuple)
+ print ("getValues returned: %s" % str(rettuple))
-Index: pyferret-1.1.0/pyfermod/__init__.py
+Index: pyferret-1.2.0/pyfermod/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/__init__.py
-+++ pyferret-1.1.0/pyfermod/__init__.py
+--- pyferret-1.2.0.orig/pyfermod/__init__.py
++++ pyferret-1.2.0/pyfermod/__init__.py
+@@ -34,7 +34,7 @@ functions provided by this module are:
+ get_arg_one_val returns the value of an argument that is the type
+ FLOAT_ONEVAL or STRING_ONEVAL.
+ """
+-
++from __future__ import print_function
+ import sys
+ import os
+ import atexit
@@ -46,6 +46,8 @@ import readline
import numpy
import numpy.ma
@@ -457,7 +437,125 @@ Index: pyferret-1.1.0/pyfermod/__init__.py
# In Debian, an application should be able to start without environmental
# variables needing to be set. So set them here.
-@@ -1577,9 +1579,9 @@ def _readline(myprompt):
+@@ -82,13 +84,13 @@ atexit.register(libpyferret._quit)
+ import pipedviewer.pyferretbindings
+
+ # the following should be in this (pyferret) directory, which should be examined first
+-import filenamecompleter
+-import graphbind
+-import regrid
+-
+-from ferrvar import FerrVar
+-from ferrdatavar import FerrDataVar
+-from ferrdataset import FerrDataSet
++from . import filenamecompleter
++from . import graphbind
++from . import regrid
++
++from .ferrvar import FerrVar
++from .ferrdatavar import FerrDataVar
++from .ferrdataset import FerrDataSet
+
+
+ def init(arglist=None, enterferret=True):
+@@ -162,9 +164,9 @@ def init(arglist=None, enterferret=True)
+ -transparent: use a transparent background instead of opaque white
+ when saving to the file given by -batch
+
+- -script: execute the script <scriptname> with any arguments
+- specified and exit (THIS MUST BE SPECIFIED LAST).
+- The -script option also implies the -nojnl, -noverify,
++ -script: execute the script <scriptname> with any arguments
++ specified and exit (THIS MUST BE SPECIFIED LAST).
++ The -script option also implies the -nojnl, -noverify,
+ -server, and -quiet options.
+
+ """
+@@ -251,13 +253,13 @@ def init(arglist=None, enterferret=True)
+ else:
+ raise ValueError("unrecognized option '%s'" % opt)
+ k += 1
+- except ValueError, errmsg:
++ except ValueError as errmsg:
+ # print the error message, then print the help message
+- print >>sys.stderr, "\n%s" % errmsg
++ print ("\n%s" % errmsg, file=sys.stderr)
+ print_help = True
+ if print_help:
+ # print the help message, then mark for exiting
+- print >>sys.stderr, ferret_help_message
++ print (ferret_help_message, file=sys.stderr)
+ just_exit = True
+ if just_exit:
+ # print the ferret header then exit completely
+@@ -272,7 +274,7 @@ def init(arglist=None, enterferret=True)
+ # Execute the $PYTHONSTARTUP file, if it exists and -secure not given
+ if not my_restrict:
+ try:
+- execfile(os.getenv('PYTHONSTARTUP', ''));
++ exec(compile(open(os.getenv('PYTHONSTARTUP', '')).read(), os.getenv('PYTHONSTARTUP', ''), 'exec'))
+ except IOError:
+ pass;
+
+@@ -496,7 +498,7 @@ def init(arglist=None, enterferret=True)
+ try:
+ result = run('go "%s"; exit /topy' % init_script)
+ except:
+- print >>sys.stderr, " **Error: exception raised in runnning script %s" % init_script
++ print (" **Error: exception raised in runnning script %s" % init_script, file=sys.stderr)
+ result = run('exit /program')
+ # should not get here
+ raise SystemExit
+@@ -508,7 +510,7 @@ def init(arglist=None, enterferret=True)
+ try:
+ result = run('go %s; exit /program' % script_line)
+ except:
+- print >>sys.stderr, " **Error: exception raised in running script %s" % script_line
++ print (" **Error: exception raised in running script %s" % script_line, file=sys.stderr)
+ # If exception or if returned early, force shutdown
+ result = run('exit /program')
+ # should not get here
+@@ -697,7 +699,7 @@ def metastr(datadict):
+ # just in case the key is not a string (for printing)
+ keystr = str(key)
+ if keystr == "axis_coords":
+- print >>strbuf, keystr + ":"
++ print (keystr + ":", file=strbuf)
+ for (idx, item) in enumerate(val):
+ # add the axis name (which will be present if coordinates
+ # are given) as a label for the axis coordinates
+@@ -727,7 +729,7 @@ def metastr(datadict):
+ indent = " " * len(itemlabel)
+ for addstr in strlist[1:]:
+ itemstr += "\n" + indent + addstr
+- print >>strbuf, itemstr
++ print (itemstr, file=strbuf)
+ elif keystr == "axis_types":
+ # add a translation of the axis type number
+ valstr = "("
+@@ -750,10 +752,10 @@ def metastr(datadict):
+ elif item == libpyferret.AXISTYPE_NORMAL:
+ valstr += "=unused"
+ valstr += ")"
+- print >>strbuf, keystr + ": " + valstr
++ print (keystr + ": " + valstr, file=strbuf)
+ elif keystr == "missing_value":
+ # print the one value in the missing value array
+- print >>strbuf, keystr + ": " + str(val[0])
++ print (keystr + ": " + str(val[0]), file=strbuf)
+ else:
+ # just print as "key: value", except
+ # adjust the subsequent-line-indent if multiple lines
+@@ -762,7 +764,7 @@ def metastr(datadict):
+ indent = " " * (len(keystr) + 2)
+ for addstr in strlist[1:]:
+ valstr += "\n" + indent + addstr
+- print >>strbuf, keystr + ": " + valstr
++ print (keystr + ": " + valstr, file=strbuf)
+ except KeyError:
+ # known key not present - ignore
+ pass
+@@ -1588,9 +1590,9 @@ def _readline(myprompt):
"""
try:
if myprompt:
@@ -469,10 +567,15 @@ Index: pyferret-1.1.0/pyfermod/__init__.py
except EOFError:
myline = None
-Index: pyferret-1.1.0/pviewmod/pipedviewerpq.py
+@@ -1935,4 +1937,3 @@ def get_arg_one_val(efid, arg):
+ raise ValueError("arg must be an integer value in [%d,%d]" % (libpyferret.ARG1,libpyferret.ARG9))
+ # make the actual call
+ return libpyferret._get_arg_one_val(int_id, int_arg)
+-
+Index: pyferret-1.2.0/pviewmod/pipedviewerpq.py
===================================================================
---- pyferret-1.1.0.orig/pviewmod/pipedviewerpq.py
-+++ pyferret-1.1.0/pviewmod/pipedviewerpq.py
+--- pyferret-1.2.0.orig/pviewmod/pipedviewerpq.py
++++ pyferret-1.2.0/pviewmod/pipedviewerpq.py
@@ -13,6 +13,7 @@ Project (TMAP) of the National Oceanogra
Administration's (NOAA) Pacific Marine Environmental Lab (PMEL).
'''
@@ -481,7 +584,7 @@ Index: pyferret-1.1.0/pviewmod/pipedviewerpq.py
import sip
try:
sip.setapi('QVariant', 2)
-@@ -1522,11 +1523,11 @@ class _CommandSubmitterPQ(QDialog):
+@@ -1563,11 +1564,11 @@ class _CommandSubmitterPQ(QDialog):
or shutdown if there are no more commands to submit.
'''
try:
@@ -495,10 +598,10 @@ Index: pyferret-1.1.0/pviewmod/pipedviewerpq.py
except IndexError:
self.__rspdpipe.close()
self.__cmndpipe.close()
-Index: pyferret-1.1.0/pyfermod/eofanal/eofanalysis.py
+Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysis.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/eofanal/eofanalysis.py
-+++ pyferret-1.1.0/pyfermod/eofanal/eofanalysis.py
+--- pyferret-1.2.0.orig/pyfermod/eofanal/eofanalysis.py
++++ pyferret-1.2.0/pyfermod/eofanal/eofanalysis.py
@@ -9,7 +9,7 @@ raised by some methods in the EOFAnalysi
@author: Karl M. Smith
@@ -673,10 +776,10 @@ Index: pyferret-1.1.0/pyfermod/eofanal/eofanalysis.py
- print 'unpickled eofanal.numeofs() = %d' % neweofanal.numeofs()
+ print ('unpickled eofanal.numeofs() = %d' % neweofanal.numeofs())
-Index: pyferret-1.1.0/pyfermod/eofanal/eofanalysistests.py
+Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysistests.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/eofanal/eofanalysistests.py
-+++ pyferret-1.1.0/pyfermod/eofanal/eofanalysistests.py
+--- pyferret-1.2.0.orig/pyfermod/eofanal/eofanalysistests.py
++++ pyferret-1.2.0/pyfermod/eofanal/eofanalysistests.py
@@ -4,7 +4,8 @@ Tests for the eofanalysis module.
@author: Karl Smith
'''
@@ -687,10 +790,10 @@ Index: pyferret-1.1.0/pyfermod/eofanal/eofanalysistests.py
import math
import numpy
import unittest
-Index: pyferret-1.1.0/pviewmod/pipedimagerpq.py
+Index: pyferret-1.2.0/pviewmod/pipedimagerpq.py
===================================================================
---- pyferret-1.1.0.orig/pviewmod/pipedimagerpq.py
-+++ pyferret-1.1.0/pviewmod/pipedimagerpq.py
+--- pyferret-1.2.0.orig/pviewmod/pipedimagerpq.py
++++ pyferret-1.2.0/pviewmod/pipedimagerpq.py
@@ -13,6 +13,7 @@ Project (TMAP) of the National Oceanogra
Administration's (NOAA) Pacific Marine Environmental Lab (PMEL).
'''
@@ -707,7 +810,7 @@ Index: pyferret-1.1.0/pviewmod/pipedimagerpq.py
import sys
import time
import os
-@@ -785,11 +787,11 @@ class _CommandSubmitterPQ(QDialog):
+@@ -787,11 +789,11 @@ class _CommandSubmitterPQ(QDialog):
cmndstr = str(self.__cmndlist[self.__nextcmnd])
if len(cmndstr) > 188:
cmndstr = cmndstr[:188] + '...'
@@ -721,10 +824,10 @@ Index: pyferret-1.1.0/pviewmod/pipedimagerpq.py
except IndexError:
self.__rspdpipe.close()
self.__cmndpipe.close()
-Index: pyferret-1.1.0/pyfermod/regrid/__init__.py
+Index: pyferret-1.2.0/pyfermod/regrid/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/__init__.py
-+++ pyferret-1.1.0/pyfermod/regrid/__init__.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/__init__.py
++++ pyferret-1.2.0/pyfermod/regrid/__init__.py
@@ -10,9 +10,9 @@ import numpy
# Import classes given in modules in this package so they are all seen here.
@@ -738,10 +841,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/__init__.py
except ImportError:
# No ESMP, but do not raise an error until attempting to actually use it
pass
-Index: pyferret-1.1.0/pyfermod/regrid/curv2rect.py
+Index: pyferret-1.2.0/pyfermod/regrid/curv2rect.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/curv2rect.py
-+++ pyferret-1.1.0/pyfermod/regrid/curv2rect.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/curv2rect.py
++++ pyferret-1.2.0/pyfermod/regrid/curv2rect.py
@@ -10,7 +10,7 @@ import numpy
import pyferret
import ESMP
@@ -751,10 +854,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/curv2rect.py
def ferret_init(efid):
'''
-Index: pyferret-1.1.0/pyfermod/regrid/curv3srect.py
+Index: pyferret-1.2.0/pyfermod/regrid/curv3srect.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/curv3srect.py
-+++ pyferret-1.1.0/pyfermod/regrid/curv3srect.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/curv3srect.py
++++ pyferret-1.2.0/pyfermod/regrid/curv3srect.py
@@ -12,7 +12,7 @@ import numpy
import pyferret
import ESMP
@@ -764,10 +867,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/curv3srect.py
def ferret_init(efid):
'''
-Index: pyferret-1.1.0/pyfermod/regrid/esmpcontroltests.py
+Index: pyferret-1.2.0/pyfermod/regrid/esmpcontroltests.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/esmpcontroltests.py
-+++ pyferret-1.1.0/pyfermod/regrid/esmpcontroltests.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/esmpcontroltests.py
++++ pyferret-1.2.0/pyfermod/regrid/esmpcontroltests.py
@@ -4,7 +4,7 @@ Tests of ESMPControl singleton class
@author: Karl Smith
'''
@@ -777,10 +880,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/esmpcontroltests.py
class Test(unittest.TestCase):
-Index: pyferret-1.1.0/pyfermod/regrid/regrid2dexample2.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid2dexample2.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid2dexample2.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid2dexample2.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dexample2.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid2dexample2.py
@@ -5,10 +5,11 @@ and also serves as a coding example of u
@author: Karl Smith
'''
@@ -858,10 +961,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid2dexample2.py
printDiffs(rect_2d_center_lons, rect_2d_center_lats, undef_val, max_negl,
rect_expect_data, rect_regrid_data)
-Index: pyferret-1.1.0/pyfermod/regrid/regrid2dexample.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid2dexample.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid2dexample.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid2dexample.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dexample.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid2dexample.py
@@ -5,10 +5,12 @@ and also serves as a coding example of u
@author: Karl Smith
'''
@@ -1019,10 +1122,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid2dexample.py
printDiffs(curv_center_lons[1:-1,1:-1],
curv_center_lats[1:-1,1:-1],
undef_val, 0.1,
-Index: pyferret-1.1.0/pyfermod/regrid/regrid2d.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid2d.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid2d.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid2d.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid2d.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid2d.py
@@ -179,10 +179,10 @@ class CurvRectRegridder(object):
center_ignore_array)
@@ -1062,10 +1165,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid2d.py
ESMP.ESMP_FieldRegridRelease(handle)
self.__curv_to_rect_handles.clear()
# Destroy any ESMP_Fields
-Index: pyferret-1.1.0/pyfermod/regrid/regrid2dtests.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid2dtests.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid2dtests.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid2dtests.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dtests.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid2dtests.py
@@ -3,12 +3,14 @@ Unit tests for CurvRectRegridder
@author: Karl Smith
@@ -1145,10 +1248,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid2dtests.py
if mismatch_found:
self.fail("data mismatch found")
-Index: pyferret-1.1.0/pyfermod/regrid/regrid3d.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid3d.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid3d.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid3d.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid3d.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid3d.py
@@ -7,6 +7,7 @@ to ESMF to perform the regridding.
@author: Karl Smith
'''
@@ -1332,10 +1435,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid3d.py
ESMP.ESMP_FieldRegridRelease(handle)
self.__curv_to_rect_handles.clear()
# Destroy any ESMP_Fields
-Index: pyferret-1.1.0/pyfermod/regrid/regrid3dexample.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid3dexample.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid3dexample.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid3dexample.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid3dexample.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid3dexample.py
@@ -4,12 +4,12 @@ and also serves as a coding example of u
@author: Karl Smith
@@ -1500,10 +1603,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid3dexample.py
printDiffs(curv_center_lons[:,:,1:-1],
curv_center_lats[:,:,1:-1],
curv_center_depths[:,:,1:-1],
-Index: pyferret-1.1.0/pyfermod/regrid/regrid3dtests.py
+Index: pyferret-1.2.0/pyfermod/regrid/regrid3dtests.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regrid3dtests.py
-+++ pyferret-1.1.0/pyfermod/regrid/regrid3dtests.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regrid3dtests.py
++++ pyferret-1.2.0/pyfermod/regrid/regrid3dtests.py
@@ -3,11 +3,12 @@ Unit tests for CurvRect3DRegridder
@author: Karl Smith
@@ -1625,10 +1728,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regrid3dtests.py
if mismatch_found:
self.fail("data mismatch found for patch regridding")
-Index: pyferret-1.1.0/pyfermod/regrid/regridtests.py
+Index: pyferret-1.2.0/pyfermod/regrid/regridtests.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/regrid/regridtests.py
-+++ pyferret-1.1.0/pyfermod/regrid/regridtests.py
+--- pyferret-1.2.0.orig/pyfermod/regrid/regridtests.py
++++ pyferret-1.2.0/pyfermod/regrid/regridtests.py
@@ -5,7 +5,8 @@ Tests of the regrid.__init__ functions
'''
import unittest
@@ -1639,10 +1742,10 @@ Index: pyferret-1.1.0/pyfermod/regrid/regridtests.py
class RegridTests(unittest.TestCase):
'''
-Index: pyferret-1.1.0/pyfermod/eofanal/eofdatapiece.py
+Index: pyferret-1.2.0/pyfermod/eofanal/eofdatapiece.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/eofanal/eofdatapiece.py
-+++ pyferret-1.1.0/pyfermod/eofanal/eofdatapiece.py
+--- pyferret-1.2.0.orig/pyfermod/eofanal/eofdatapiece.py
++++ pyferret-1.2.0/pyfermod/eofanal/eofdatapiece.py
@@ -6,7 +6,8 @@ Time Amplitude Funtion (TAF)
@author: Karl Smith
@@ -1699,10 +1802,10 @@ Index: pyferret-1.1.0/pyfermod/eofanal/eofdatapiece.py
- print "sum %d pieces different from input data" % lastone
+ print ("sum %d pieces different from input data" % lastone)
-Index: pyferret-1.1.0/pyfermod/eofanal/eofdatasum.py
+Index: pyferret-1.2.0/pyfermod/eofanal/eofdatasum.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/eofanal/eofdatasum.py
-+++ pyferret-1.1.0/pyfermod/eofanal/eofdatasum.py
+--- pyferret-1.2.0.orig/pyfermod/eofanal/eofdatasum.py
++++ pyferret-1.2.0/pyfermod/eofanal/eofdatasum.py
@@ -8,7 +8,8 @@ Functions (EOFs) and their corresponding
@author: Karl Smith
'''
@@ -1759,10 +1862,10 @@ Index: pyferret-1.1.0/pyfermod/eofanal/eofdatasum.py
- print "sum %d different from input data" % lastone
+ print ("sum %d different from input data" % lastone)
-Index: pyferret-1.1.0/pyfermod/eofanal/__init__.py
+Index: pyferret-1.2.0/pyfermod/eofanal/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/eofanal/__init__.py
-+++ pyferret-1.1.0/pyfermod/eofanal/__init__.py
+--- pyferret-1.2.0.orig/pyfermod/eofanal/__init__.py
++++ pyferret-1.2.0/pyfermod/eofanal/__init__.py
@@ -6,5 +6,5 @@ especially for Python external functions
'''
@@ -1770,10 +1873,10 @@ Index: pyferret-1.1.0/pyfermod/eofanal/__init__.py
-from eofanalysis import InvalidStateError, EOFAnalysis
+from .eofanalysis import InvalidStateError, EOFAnalysis
-Index: pyferret-1.1.0/pyfermod/fershp/__init__.py
+Index: pyferret-1.2.0/pyfermod/fershp/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/__init__.py
-+++ pyferret-1.1.0/pyfermod/fershp/__init__.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/__init__.py
++++ pyferret-1.2.0/pyfermod/fershp/__init__.py
@@ -2,6 +2,7 @@
Helper functions for pyferret shapefile external functions.
"""
@@ -1825,10 +1928,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/__init__.py
- print "addquadxyvalues: SUCCESS"
+ print ("addquadxyvalues: SUCCESS")
-Index: pyferret-1.1.0/pyfermod/fershp/mapprj.py
+Index: pyferret-1.2.0/pyfermod/fershp/mapprj.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/mapprj.py
-+++ pyferret-1.1.0/pyfermod/fershp/mapprj.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/mapprj.py
++++ pyferret-1.2.0/pyfermod/fershp/mapprj.py
@@ -2,6 +2,8 @@
Map projection file utility functions
"""
@@ -1844,10 +1947,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/mapprj.py
- print "mapprj: SUCCESS"
+ print ("mapprj: SUCCESS")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxy.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxy.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_readxy.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_readxy.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_readxy.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_readxy.py
@@ -4,6 +4,8 @@ coordinates from the points in the indic
The missing value separates coordinates between shapes.
"""
@@ -1891,10 +1994,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxy.py
+ print ("number of shapes = %d" % shape_num)
+ print ("shapefile_readxy: SUCCESS")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyval.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyval.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_readxyval.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_readxyval.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_readxyval.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_readxyval.py
@@ -4,6 +4,8 @@ latitude), as well as a value for shapes
The missing value separates coordinates between shapes.
"""
@@ -1946,10 +2049,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyval.py
- print "shapefile_readxyval: SUCCESS"
+ print ("shapefile_readxyval: SUCCESS")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyz.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyz.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_readxyz.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_readxyz.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_readxyz.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_readxyz.py
@@ -3,7 +3,7 @@ Returns the X, Y, and Z (presumably long
coordinates from the points in the indicated shapefile.
The missing value separates coordinates between shapes.
@@ -1968,10 +2071,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyz.py
+ print ("shapefile_readxyz: SUCCESS (limited)")
+ print (" run shapefile_writexyzval for full test")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyzval.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyzval.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_readxyzval.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_readxyzval.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_readxyzval.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_readxyzval.py
@@ -4,7 +4,8 @@ latitude, and level), as well as a value
a shapefile. The missing value separates coordinates
between shapes.
@@ -2004,10 +2107,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_readxyzval.py
+ print ("shapefile_readxyzval: SUCCESS (limited)")
+ print (" run shapefile_writexyzval for full test")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writeval.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writeval.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_writeval.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_writeval.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_writeval.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_writeval.py
@@ -5,7 +5,8 @@ this axis is used). The vertices of the
of the bounding boxes of the X and Y axes of the given value array. The
value(s) associated with each shape comes from the value array.
@@ -2024,10 +2127,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writeval.py
- print "shapefile_writeval: SUCCESS (limited)"
+ print ("shapefile_writeval: SUCCESS (limited)")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writexyval.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyval.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_writexyval.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_writexyval.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_writexyval.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_writexyval.py
@@ -9,7 +9,8 @@ element of the value for the previously
Quadrilaterals associated with missing values are omitted from
the shapefile.
@@ -2054,10 +2157,10 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writexyval.py
- print "shapefile_writexyval: SUCCESS"
+ print ("shapefile_writexyval: SUCCESS")
-Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writexyzval.py
+Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyzval.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/fershp/shapefile_writexyzval.py
-+++ pyferret-1.1.0/pyfermod/fershp/shapefile_writexyzval.py
+--- pyferret-1.2.0.orig/pyfermod/fershp/shapefile_writexyzval.py
++++ pyferret-1.2.0/pyfermod/fershp/shapefile_writexyzval.py
@@ -10,6 +10,8 @@ mentioned quadrilateral. Quadrilaterals
values are omitted from the shapefile.
"""
@@ -2100,11 +2203,22 @@ Index: pyferret-1.1.0/pyfermod/fershp/shapefile_writexyzval.py
os.remove("%s.dbf" % shapefilename)
os.remove("%s.shp" % shapefilename)
-Index: pyferret-1.1.0/pyfermod/graphbind/__init__.py
+Index: pyferret-1.2.0/pyfermod/graphbind/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/graphbind/__init__.py
-+++ pyferret-1.1.0/pyfermod/graphbind/__init__.py
-@@ -10,7 +10,7 @@ instance is returned.
+--- pyferret-1.2.0.orig/pyfermod/graphbind/__init__.py
++++ pyferret-1.2.0/pyfermod/graphbind/__init__.py
+@@ -1,16 +1,17 @@
+ '''
++
+ Maintains a dictionary of classes which can be used to bind PyFerret
+ graphics calls to a particular graphics engine.
+
+ When a new Window is needed, the createWindow function in this module
+ is called. This function creates an instance of the appropriate
+-bindings class, its createWindow method is called, and the bindings
++bindings class, its createWindow method is called, and the bindings
+ instance is returned.
+
Other methods of the bindings instance are called directly to perform
graphics operations on this Window.
'''
@@ -2113,16 +2227,26 @@ Index: pyferret-1.1.0/pyfermod/graphbind/__init__.py
from abstractpyferretbindings import AbstractPyFerretBindings
__pyferret_bindings_classes = { }
-@@ -108,4 +108,4 @@ if __name__ == "__main__":
+@@ -46,7 +47,7 @@ def knownPyFerretEngines():
+ Returns a tuple of all the known engine names.
+ '''
+ return tuple( __pyferret_bindings_classes.keys() )
+-
++
+ def createWindow(engine_name, title, visible, noalpha):
+ '''
+ Creates an instance of the bindings class associated with
+@@ -109,5 +110,4 @@ if __name__ == "__main__":
(known_engines[0] != TestBindings.engine_name):
raise RuntimeError("Unexpected tuple of known engines: %s" % \
str(known_engines))
- print "Success"
+-
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/__init__.py
+Index: pyferret-1.2.0/pyfermod/stats/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/__init__.py
-+++ pyferret-1.1.0/pyfermod/stats/__init__.py
+--- pyferret-1.2.0.orig/pyfermod/stats/__init__.py
++++ pyferret-1.2.0/pyfermod/stats/__init__.py
@@ -1,6 +1,8 @@
"""
Helper functions for pyferret stats external functions.
@@ -2737,10 +2861,10 @@ Index: pyferret-1.1.0/pyfermod/stats/__init__.py
# Pareto distribution
-Index: pyferret-1.1.0/pyfermod/stats/stats_cdf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_cdf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_cdf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_cdf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_cdf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_cdf.py
@@ -2,6 +2,8 @@
Returns the array of cumulative distribution function values
for a probability distribution and set of abscissa values.
@@ -2764,10 +2888,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_cdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_chisquare.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_chisquare.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_chisquare.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_chisquare.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_chisquare.py
++++ pyferret-1.2.0/pyfermod/stats/stats_chisquare.py
@@ -3,6 +3,8 @@ Performs a chi-square test that a sample
counts of categorical data comes from a population with the
given expected counts or relative frequencies of that data.
@@ -2816,10 +2940,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_chisquare.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_fit.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_fit.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_fit.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_fit.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_fit.py
++++ pyferret-1.2.0/pyfermod/stats/stats_fit.py
@@ -2,6 +2,8 @@
Returns parameter values for a specified probability distribution type
that best describe the distribution of a given array of values.
@@ -2836,10 +2960,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_fit.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_helper.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_helper.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_helper.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_helper.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_helper.py
++++ pyferret-1.2.0/pyfermod/stats/stats_helper.py
@@ -2,6 +2,8 @@
Returns an array of strings describing
the parameters for a probability distribution.
@@ -2867,10 +2991,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_helper.py
# Stop after printing an empty line
if not params_array[k]:
break;
-Index: pyferret-1.1.0/pyfermod/stats/stats_histogram.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_histogram.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_histogram.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_histogram.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_histogram.py
++++ pyferret-1.2.0/pyfermod/stats/stats_histogram.py
@@ -1,6 +1,7 @@
"""
Returns histogram bin counts for a given array of values.
@@ -2886,10 +3010,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_histogram.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_isf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_isf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_isf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_isf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_isf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_isf.py
@@ -2,6 +2,8 @@
Returns the array of inverse survival function values for
a probability distribution and set of quantile values.
@@ -2913,10 +3037,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_isf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_kstest1.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_kstest1.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_kstest1.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_kstest1.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_kstest1.py
++++ pyferret-1.2.0/pyfermod/stats/stats_kstest1.py
@@ -2,6 +2,8 @@
Performs a two-sided Kolmogorov-Smirnov test that the provided
sample comes from the given probability distribution function.
@@ -2949,10 +3073,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_kstest1.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_kstest2.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_kstest2.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_kstest2.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_kstest2.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_kstest2.py
++++ pyferret-1.2.0/pyfermod/stats/stats_kstest2.py
@@ -2,6 +2,8 @@
Performs a two-sided Kolmogorov-Smirnov test that two samples
come from the same continuous probability distribution.
@@ -2985,10 +3109,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_kstest2.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_linregress.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_linregress.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_linregress.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_linregress.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_linregress.py
++++ pyferret-1.2.0/pyfermod/stats/stats_linregress.py
@@ -2,6 +2,8 @@
Returns parameters resulting from a linear regression of one set
of given data against another set of given data.
@@ -3005,10 +3129,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_linregress.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_norm_pdf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_norm_pdf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_norm_pdf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_norm_pdf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_norm_pdf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_norm_pdf.py
@@ -4,6 +4,8 @@ for the Normal probability distribution
using the given arrays for the abscissa or template
values and each of the parameters values.
@@ -3032,10 +3156,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_norm_pdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_pdf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_pdf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_pdf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_pdf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_pdf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_pdf.py
@@ -2,6 +2,8 @@
Returns the array of probability density function values for a
continuous probability distribution and set of abscissa values.
@@ -3059,10 +3183,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_pdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_pearsonr.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_pearsonr.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_pearsonr.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_pearsonr.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_pearsonr.py
++++ pyferret-1.2.0/pyfermod/stats/stats_pearsonr.py
@@ -2,6 +2,8 @@
Returns the Pearson product-moment correlation
coefficient between two samples of data.
@@ -3079,10 +3203,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_pearsonr.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_percentilesofscores.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_percentilesofscores.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_percentilesofscores.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_percentilesofscores.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_percentilesofscores.py
++++ pyferret-1.2.0/pyfermod/stats/stats_percentilesofscores.py
@@ -1,6 +1,8 @@
"""
Returns interpolated percentiles through a sample of scores (values)
@@ -3106,10 +3230,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_percentilesofscores.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_pmf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_pmf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_pmf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_pmf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_pmf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_pmf.py
@@ -2,6 +2,8 @@
Returns the array of probability density function values for a
discrete probability distribution and set of abscissa values.
@@ -3133,10 +3257,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_pmf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_ppf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_ppf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_ppf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_ppf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_ppf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_ppf.py
@@ -2,6 +2,8 @@
Returns the array of percent point function values for
a probability distribution and set of quantile values.
@@ -3160,10 +3284,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_ppf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_probplotvals.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_probplotvals.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_probplotvals.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_probplotvals.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_probplotvals.py
++++ pyferret-1.2.0/pyfermod/stats/stats_probplotvals.py
@@ -13,6 +13,8 @@ distribution. Thus, the slope, intercep
(r) of this fitted line are returned and the first three X elements
of the third Y axis value.
@@ -3196,10 +3320,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_probplotvals.py
# All successful
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_rvs.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_rvs.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_rvs.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_rvs.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_rvs.py
++++ pyferret-1.2.0/pyfermod/stats/stats_rvs.py
@@ -2,6 +2,8 @@
Returns the array of random variates for a probability distribution
assigned to positions corresponding to defined values in an input array.
@@ -3216,10 +3340,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_rvs.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_scoresatpercentiles.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_scoresatpercentiles.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_scoresatpercentiles.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_scoresatpercentiles.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_scoresatpercentiles.py
++++ pyferret-1.2.0/pyfermod/stats/stats_scoresatpercentiles.py
@@ -1,6 +1,8 @@
"""
Returns interpolated scores (values) at percentiles through a sample
@@ -3243,10 +3367,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_scoresatpercentiles.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_sf.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_sf.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_sf.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_sf.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_sf.py
++++ pyferret-1.2.0/pyfermod/stats/stats_sf.py
@@ -2,6 +2,8 @@
Returns the array of survival function values for a
probability distribution and set of abscissa values.
@@ -3270,10 +3394,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_sf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_spearmanr.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_spearmanr.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_spearmanr.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_spearmanr.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_spearmanr.py
++++ pyferret-1.2.0/pyfermod/stats/stats_spearmanr.py
@@ -1,6 +1,8 @@
"""
Returns Spearman's rank correlation coefficient between two samples of data.
@@ -3290,10 +3414,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_spearmanr.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_stats.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_stats.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_stats.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_stats.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_stats.py
++++ pyferret-1.2.0/pyfermod/stats/stats_stats.py
@@ -2,6 +2,8 @@
Returns the (unweighted) mean, variance, skew, and kurtoses
of an array of values
@@ -3310,10 +3434,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_stats.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_ttest1.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_ttest1.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_ttest1.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_ttest1.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_ttest1.py
++++ pyferret-1.2.0/pyfermod/stats/stats_ttest1.py
@@ -2,6 +2,8 @@
Performs a two-sided T-test that the provided sample
comes from a population with the given mean(s).
@@ -3337,10 +3461,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_ttest1.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_ttest2ind.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2ind.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_ttest2ind.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_ttest2ind.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_ttest2ind.py
++++ pyferret-1.2.0/pyfermod/stats/stats_ttest2ind.py
@@ -2,6 +2,8 @@
Performs a two-sided T-test that two independent samples
come from (normal) distributions with the same mean.
@@ -3373,10 +3497,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_ttest2ind.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_ttest2rel.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2rel.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_ttest2rel.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_ttest2rel.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_ttest2rel.py
++++ pyferret-1.2.0/pyfermod/stats/stats_ttest2rel.py
@@ -2,6 +2,8 @@
Performs a two-sided T-test that two related (paired) samples
come from (normal) distributions with the same mean.
@@ -3410,10 +3534,10 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_ttest2rel.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.1.0/pyfermod/stats/stats_zscore.py
+Index: pyferret-1.2.0/pyfermod/stats/stats_zscore.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/stats/stats_zscore.py
-+++ pyferret-1.1.0/pyfermod/stats/stats_zscore.py
+--- pyferret-1.2.0.orig/pyfermod/stats/stats_zscore.py
++++ pyferret-1.2.0/pyfermod/stats/stats_zscore.py
@@ -3,6 +3,8 @@ Returns the array of standard scores for
standard score are for the standard distribution centered of the
mean value of the data with the same variance as the data.
@@ -3437,3 +3561,70 @@ Index: pyferret-1.1.0/pyfermod/stats/stats_zscore.py
- print "Success"
+ print ("Success")
+Index: pyferret-1.2.0/pyfermod/ferrdataset.py
+===================================================================
+--- pyferret-1.2.0.orig/pyfermod/ferrdataset.py
++++ pyferret-1.2.0/pyfermod/ferrdataset.py
+@@ -5,7 +5,7 @@ Represents a data file and the data vari
+ '''
+
+ import pyferret
+-from ferrdatavar import FerrDataVar
++from .ferrdatavar import FerrDataVar
+
+ class FerrDataSet(object):
+ '''
+@@ -15,10 +15,9 @@ class FerrDataSet(object):
+ def __init__(self, filename):
+ '''
+ Opens the given netCDF file in Ferret using the Ferret "USE" command.
+- Creates a FerDataVar for each data variable in this data file and
++ Creates a FerDataVar for each data variable in this data file and
+ assigns it as an attribute of this class whose name is the variable name.
+ Assigns the list of all variables to the __datavars attribute.
+ '''
+ self.filename = filename
+ (errval, errmsg) = pyferret.run('USE "' + self.filename + '"')
+-
+Index: pyferret-1.2.0/pyfermod/ferrdatavar.py
+===================================================================
+--- pyferret-1.2.0.orig/pyfermod/ferrdatavar.py
++++ pyferret-1.2.0/pyfermod/ferrdatavar.py
+@@ -3,18 +3,18 @@ Represents Ferret data variables whose d
+
+ @author: Karl Smith
+ '''
+-from ferrvar import FerrVar
++from .ferrvar import FerrVar
+
+ class FerrDataVar(FerrVar):
+ '''
+- A Ferret data variable whose data comes directly from a given data file.
++ A Ferret data variable whose data comes directly from a given data file.
+ '''
+
+
+ def __init__(self, name, dataset):
+ '''
+- Represents a Ferret data variable with the given name
+- associated with the given dataset. No data is read
++ Represents a Ferret data variable with the given name
++ associated with the given dataset. No data is read
+ for this data variable.
+ '''
+ self.name = name
+Index: pyferret-1.2.0/pyfermod/libpyferret.c
+===================================================================
+--- pyferret-1.2.0.orig/pyfermod/libpyferret.c
++++ pyferret-1.2.0/pyfermod/libpyferret.c
+@@ -42,6 +42,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_AsLong PyLong_AsLong
++#endif
++
+ #include "ferret.h"
+ #include "ferret_shared_buffer.h"
+ #include "EF_Util.h"
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 7b514e1..b5f0175 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -22,3 +22,17 @@ Index: pyferret-1.2.0/fer/Makefile
#
# Macros
+Index: pyferret-1.2.0/fer/grdel/window.c
+===================================================================
+--- pyferret-1.2.0.orig/fer/grdel/window.c
++++ pyferret-1.2.0/fer/grdel/window.c
+@@ -24,6 +24,9 @@
+ #include "cferbind.h"
+ #include "pyferret.h"
+
++#if PY_MAJOR_VERSION >=3
++#define PyString_FromString(x) PyUnicode_FromString(x)
++#endif
+
+ #ifdef VERBOSEDEBUG
+ #include <stdio.h>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git
More information about the debian-science-commits
mailing list