[pyferret] 67/110: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 08:42:11 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 5b0d11ea41994af9d418d6ae51077c470e73e40d
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Aug 13 20:14:41 2016 +0100
refresh patches
---
debian/patches/automate-tests.parch | 14 +-
debian/patches/python3.patch | 724 +++++++++++++++++-------------------
debian/patches/reproducible.patch | 17 +-
debian/patches/set-envvars.patch | 18 +-
4 files changed, 375 insertions(+), 398 deletions(-)
diff --git a/debian/patches/automate-tests.parch b/debian/patches/automate-tests.parch
index cf1f6ff..b1d0238 100644
--- a/debian/patches/automate-tests.parch
+++ b/debian/patches/automate-tests.parch
@@ -3,10 +3,10 @@ Description: local changes to make tests automated under Debian
Last-Updated: 2016-03-01
Forwarded: not-needed
-Index: pyferret-1.2.0/bench/run_all
+Index: pyferret-7.0.0/bench/run_all
===================================================================
---- pyferret-1.2.0.orig/bench/run_all
-+++ pyferret-1.2.0/bench/run_all
+--- pyferret-7.0.0.orig/bench/run_all
++++ pyferret-7.0.0/bench/run_all
@@ -55,6 +55,8 @@
# *sh* 4/2015 automatically run clean_draconian at the end
@@ -16,7 +16,7 @@ Index: pyferret-1.2.0/bench/run_all
umask 002 # make all files group deletable 3/16
set rhlev = "0"
-@@ -93,8 +95,8 @@ if ($rhlev == six) then
+@@ -76,8 +78,8 @@ if ($rhlev == six) then
echo six
endif
@@ -27,7 +27,7 @@ Index: pyferret-1.2.0/bench/run_all
# XGKS version ? (use "xg" as the indicator)
echo $fver | grep -s "xg"
-@@ -105,14 +107,14 @@ endif
+@@ -88,14 +90,14 @@ endif
# *acm* 4/5/05 optionally do externally-linked external function tests
#
echo "Run tests of externally-linked external functions? Enter y or n"
@@ -44,7 +44,7 @@ Index: pyferret-1.2.0/bench/run_all
echo "Contents of "$efdir "fcns a* :"
echo " "
ls -1 $efdir/a*
-@@ -122,11 +124,12 @@ endif
+@@ -105,11 +107,12 @@ endif
# background info to go in the benchmark file
echo "Enter your name"
@@ -60,7 +60,7 @@ Index: pyferret-1.2.0/bench/run_all
set date_stamp = `date +'%d%h%yAT%H%M'|tr '[A-Z]' '[a-z]'`
set log_file = "all_${date_stamp}.${machine}_log"
-@@ -148,7 +151,7 @@ if ( ! -e $machine_stream ) then
+@@ -131,7 +134,7 @@ if ( ! -e $machine_stream ) then
echo To create $machine_stream compile and run make_stream_file.F
echo Then rename stream10by5.unf to $machine_stream
echo -n 'Continue anyway? (answer "y" for yes)'
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 2b04621..56f6b33 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.2.0/ferretmagic.py
+Index: pyferret-7.0.0/ferretmagic.py
===================================================================
---- pyferret-1.2.0.orig/ferretmagic.py
-+++ pyferret-1.2.0/ferretmagic.py
+--- pyferret-7.0.0.orig/ferretmagic.py
++++ pyferret-7.0.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.2.0/ferretmagic.py
# Let's rewrite InteractiveShell.run_cell to do automatic processing with pyferret,
# if desired
-Index: pyferret-1.2.0/gcircle.py
+Index: pyferret-7.0.0/gcircle.py
===================================================================
---- pyferret-1.2.0.orig/gcircle.py
-+++ pyferret-1.2.0/gcircle.py
+--- pyferret-7.0.0.orig/gcircle.py
++++ pyferret-7.0.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.2.0/gcircle.py
- print
+ print ("Equidistscatter region PASS")
+ print ()
-Index: pyferret-1.2.0/pyfermod/filenamecompleter.py
+Index: pyferret-7.0.0/pyfermod/filenamecompleter.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/filenamecompleter.py
-+++ pyferret-1.2.0/pyfermod/filenamecompleter.py
+--- pyferret-7.0.0.orig/pyfermod/filenamecompleter.py
++++ pyferret-7.0.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.2.0/pyfermod/filenamecompleter.py
+ print ('')
+ print ('Success')
-Index: pyferret-1.2.0/pviewmod/__init__.py
+Index: pyferret-7.0.0/pviewmod/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pviewmod/__init__.py
-+++ pyferret-1.2.0/pviewmod/__init__.py
+--- pyferret-7.0.0.orig/pviewmod/__init__.py
++++ pyferret-7.0.0/pviewmod/__init__.py
@@ -8,6 +8,8 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -371,10 +371,10 @@ Index: pyferret-1.2.0/pviewmod/__init__.py
else:
- print "Done with %s" % viewername
+ print ("Done with %s" % viewername)
-Index: pyferret-1.2.0/pviewmod/pyferretbindings.py
+Index: pyferret-7.0.0/pviewmod/pyferretbindings.py
===================================================================
---- pyferret-1.2.0.orig/pviewmod/pyferretbindings.py
-+++ pyferret-1.2.0/pviewmod/pyferretbindings.py
+--- pyferret-7.0.0.orig/pviewmod/pyferretbindings.py
++++ pyferret-7.0.0/pviewmod/pyferretbindings.py
@@ -15,9 +15,11 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -422,10 +422,10 @@ Index: pyferret-1.2.0/pviewmod/pyferretbindings.py
- print "Done with bindings for %s" % viewertype
+ print ("Done with bindings for %s" % viewertype)
-Index: pyferret-1.2.0/pviewmod/scaledialogpq.py
+Index: pyferret-7.0.0/pviewmod/scaledialogpq.py
===================================================================
---- pyferret-1.2.0.orig/pviewmod/scaledialogpq.py
-+++ pyferret-1.2.0/pviewmod/scaledialogpq.py
+--- pyferret-7.0.0.orig/pviewmod/scaledialogpq.py
++++ pyferret-7.0.0/pviewmod/scaledialogpq.py
@@ -6,6 +6,7 @@ This package was developed by the Therma
Pacific Marine Environmental Lab (PMEL).
'''
@@ -444,50 +444,94 @@ Index: pyferret-1.2.0/pviewmod/scaledialogpq.py
rettuple = resizedialog.getValues()
- print "getValues returned: %s" % str(rettuple)
+ print ("getValues returned: %s" % str(rettuple))
-Index: pyferret-1.2.0/pyfermod/__init__.py
+Index: pyferret-7.0.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.
+--- pyferret-7.0.0.orig/pyfermod/__init__.py
++++ pyferret-7.0.0/pyfermod/__init__.py
+@@ -29,10 +29,11 @@ under pyferret.fermethods and are import
+ These methods also help reduce the need to know the Ferret language
+ and syntax.
"""
-
+from __future__ import print_function
import sys
import os
import atexit
-@@ -46,6 +46,8 @@ import readline
- import numpy
- import numpy.ma
- import StringIO
-+from past.builtins import xrange
-+from buildins import input
-
- # In Debian, an application should be able to start without environmental
- # variables needing to be set. So set them here.
-@@ -82,13 +84,13 @@ atexit.register(libpyferret._quit)
++from builtins import input
+ try:
+ import rlcompleter
+ except ImportError:
+@@ -60,46 +61,46 @@ import libpyferret
+ from libpyferret import *
+
+ # methods for transferring data between the Ferret engine and Python
+-import datamethods
++from . import datamethods
+ # also import the methods given in datamethods into pyferret
+-from datamethods import *
++from .datamethods import *
+
+ # methods to assist in writing Ferret external functions written in Python
+-import pyefmethods
++from . import pyefmethods
+ # also import the methods given in pyefmethods into pyferret
+-from pyefmethods import *
++from .pyefmethods import *
+
+ # the FerRegion, FerAxis, FerGrid, FerVar, FerPyVar, and FerDSet objects
+ # for working with Ferret from Python
+-import ferregion
+-from ferregion import *
+-import feraxis
+-from feraxis import *
+-import fergrid
+-from fergrid import *
+-import fervar
+-from fervar import *
+-import ferpyvar
+-from ferpyvar import *
+-import ferdset
+-from ferdset import *
+-import feraggdset
+-from feraggdset import *
++from . import ferregion
++from .ferregion import *
++from . import feraxis
++from .feraxis import *
++from . import fergrid
++from .fergrid import *
++from . import fervar
++from . fervar import *
++from . import ferpyvar
++from .ferpyvar import *
++from . import ferdset
++from .ferdset import *
++from . import feraggdset
++from .feraggdset import *
+
+ # Create "the" anonymous dataset
+ anondset = FerDSet(qual=ferdset._anonymous_dataset_qualifier)
+
+ # convenience methods for executing common Ferret commands
+-import fermethods
+-from fermethods import *
++from . import fermethods
++from .fermethods import *
+
+ # bindings for the PyQt-based graphics engines
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)
+ """
+@@ -180,9 +181,9 @@ def init(arglist=None, enterferret=True)
-transparent: use a transparent background instead of opaque white
when saving to the file given by -batch
@@ -500,7 +544,7 @@ Index: pyferret-1.2.0/pyfermod/__init__.py
-server, and -quiet options.
"""
-@@ -251,13 +253,13 @@ def init(arglist=None, enterferret=True)
+@@ -272,13 +273,13 @@ def init(arglist=None, enterferret=True)
else:
raise ValueError("unrecognized option '%s'" % opt)
k += 1
@@ -517,16 +561,7 @@ Index: pyferret-1.2.0/pyfermod/__init__.py
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)
+@@ -508,7 +509,7 @@ def init(arglist=None, enterferret=True)
try:
result = run('go "%s"; exit /topy' % init_script)
except:
@@ -535,7 +570,7 @@ Index: pyferret-1.2.0/pyfermod/__init__.py
result = run('exit /program')
# should not get here
raise SystemExit
-@@ -508,7 +510,7 @@ def init(arglist=None, enterferret=True)
+@@ -520,7 +521,7 @@ def init(arglist=None, enterferret=True)
try:
result = run('go %s; exit /program' % script_line)
except:
@@ -544,67 +579,31 @@ Index: pyferret-1.2.0/pyfermod/__init__.py
# 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):
+@@ -628,7 +629,7 @@ def start(memsize=25, journal=True, veri
+ # Execute the $PYTHONSTARTUP file, if it exists and -secure not given
+ if not restrict:
+ try:
+- execfile(os.getenv('PYTHONSTARTUP', ''));
++ exec(compile(open(os.getenv('PYTHONSTARTUP', '')).read(), os.getenv('PYTHONSTARTUP', ''), 'exec'));
+ except IOError:
+ pass;
+
+@@ -746,9 +747,9 @@ def _readline(myprompt):
"""
try:
if myprompt:
- myline = raw_input(myprompt)
-+ myline = input(myprompt)
++ myline = eval(input(myprompt))
else:
- myline = raw_input()
-+ myline = input()
++ myline = eval(input())
except EOFError:
myline = None
-@@ -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
+Index: pyferret-7.0.0/pviewmod/pipedviewerpq.py
===================================================================
---- pyferret-1.2.0.orig/pviewmod/pipedviewerpq.py
-+++ pyferret-1.2.0/pviewmod/pipedviewerpq.py
+--- pyferret-7.0.0.orig/pviewmod/pipedviewerpq.py
++++ pyferret-7.0.0/pviewmod/pipedviewerpq.py
@@ -13,6 +13,7 @@ Project (TMAP) of the National Oceanogra
Administration's (NOAA) Pacific Marine Environmental Lab (PMEL).
'''
@@ -627,10 +626,10 @@ Index: pyferret-1.2.0/pviewmod/pipedviewerpq.py
except IndexError:
self.__rspdpipe.close()
self.__cmndpipe.close()
-Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysis.py
+Index: pyferret-7.0.0/pyfermod/eofanal/eofanalysis.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/eofanal/eofanalysis.py
-+++ pyferret-1.2.0/pyfermod/eofanal/eofanalysis.py
+--- pyferret-7.0.0.orig/pyfermod/eofanal/eofanalysis.py
++++ pyferret-7.0.0/pyfermod/eofanal/eofanalysis.py
@@ -9,7 +9,7 @@ raised by some methods in the EOFAnalysi
@author: Karl M. Smith
@@ -805,10 +804,10 @@ Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysis.py
- print 'unpickled eofanal.numeofs() = %d' % neweofanal.numeofs()
+ print ('unpickled eofanal.numeofs() = %d' % neweofanal.numeofs())
-Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysistests.py
+Index: pyferret-7.0.0/pyfermod/eofanal/eofanalysistests.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/eofanal/eofanalysistests.py
-+++ pyferret-1.2.0/pyfermod/eofanal/eofanalysistests.py
+--- pyferret-7.0.0.orig/pyfermod/eofanal/eofanalysistests.py
++++ pyferret-7.0.0/pyfermod/eofanal/eofanalysistests.py
@@ -4,7 +4,8 @@ Tests for the eofanalysis module.
@author: Karl Smith
'''
@@ -819,10 +818,10 @@ Index: pyferret-1.2.0/pyfermod/eofanal/eofanalysistests.py
import math
import numpy
import unittest
-Index: pyferret-1.2.0/pviewmod/pipedimagerpq.py
+Index: pyferret-7.0.0/pviewmod/pipedimagerpq.py
===================================================================
---- pyferret-1.2.0.orig/pviewmod/pipedimagerpq.py
-+++ pyferret-1.2.0/pviewmod/pipedimagerpq.py
+--- pyferret-7.0.0.orig/pviewmod/pipedimagerpq.py
++++ pyferret-7.0.0/pviewmod/pipedimagerpq.py
@@ -13,6 +13,7 @@ Project (TMAP) of the National Oceanogra
Administration's (NOAA) Pacific Marine Environmental Lab (PMEL).
'''
@@ -853,10 +852,10 @@ Index: pyferret-1.2.0/pviewmod/pipedimagerpq.py
except IndexError:
self.__rspdpipe.close()
self.__cmndpipe.close()
-Index: pyferret-1.2.0/pyfermod/regrid/__init__.py
+Index: pyferret-7.0.0/pyfermod/regrid/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/__init__.py
-+++ pyferret-1.2.0/pyfermod/regrid/__init__.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/__init__.py
++++ pyferret-7.0.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.
@@ -870,10 +869,10 @@ Index: pyferret-1.2.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.2.0/pyfermod/regrid/curv2rect.py
+Index: pyferret-7.0.0/pyfermod/regrid/curv2rect.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/curv2rect.py
-+++ pyferret-1.2.0/pyfermod/regrid/curv2rect.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/curv2rect.py
++++ pyferret-7.0.0/pyfermod/regrid/curv2rect.py
@@ -10,7 +10,7 @@ import numpy
import pyferret
import ESMP
@@ -883,10 +882,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/curv2rect.py
def ferret_init(efid):
'''
-Index: pyferret-1.2.0/pyfermod/regrid/curv3srect.py
+Index: pyferret-7.0.0/pyfermod/regrid/curv3srect.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/curv3srect.py
-+++ pyferret-1.2.0/pyfermod/regrid/curv3srect.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/curv3srect.py
++++ pyferret-7.0.0/pyfermod/regrid/curv3srect.py
@@ -12,7 +12,7 @@ import numpy
import pyferret
import ESMP
@@ -896,10 +895,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/curv3srect.py
def ferret_init(efid):
'''
-Index: pyferret-1.2.0/pyfermod/regrid/esmpcontroltests.py
+Index: pyferret-7.0.0/pyfermod/regrid/esmpcontroltests.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/esmpcontroltests.py
-+++ pyferret-1.2.0/pyfermod/regrid/esmpcontroltests.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/esmpcontroltests.py
++++ pyferret-7.0.0/pyfermod/regrid/esmpcontroltests.py
@@ -4,7 +4,7 @@ Tests of ESMPControl singleton class
@author: Karl Smith
'''
@@ -909,10 +908,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/esmpcontroltests.py
class Test(unittest.TestCase):
-Index: pyferret-1.2.0/pyfermod/regrid/regrid2dexample2.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid2dexample2.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dexample2.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid2dexample2.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid2dexample2.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid2dexample2.py
@@ -5,10 +5,11 @@ and also serves as a coding example of u
@author: Karl Smith
'''
@@ -990,10 +989,10 @@ Index: pyferret-1.2.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.2.0/pyfermod/regrid/regrid2dexample.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid2dexample.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dexample.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid2dexample.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid2dexample.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid2dexample.py
@@ -5,10 +5,12 @@ and also serves as a coding example of u
@author: Karl Smith
'''
@@ -1151,10 +1150,10 @@ Index: pyferret-1.2.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.2.0/pyfermod/regrid/regrid2d.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid2d.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid2d.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid2d.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid2d.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid2d.py
@@ -179,10 +179,10 @@ class CurvRectRegridder(object):
center_ignore_array)
@@ -1194,10 +1193,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regrid2d.py
ESMP.ESMP_FieldRegridRelease(handle)
self.__curv_to_rect_handles.clear()
# Destroy any ESMP_Fields
-Index: pyferret-1.2.0/pyfermod/regrid/regrid2dtests.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid2dtests.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid2dtests.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid2dtests.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid2dtests.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid2dtests.py
@@ -3,12 +3,14 @@ Unit tests for CurvRectRegridder
@author: Karl Smith
@@ -1277,10 +1276,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regrid2dtests.py
if mismatch_found:
self.fail("data mismatch found")
-Index: pyferret-1.2.0/pyfermod/regrid/regrid3d.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid3d.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid3d.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid3d.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid3d.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid3d.py
@@ -7,6 +7,7 @@ to ESMF to perform the regridding.
@author: Karl Smith
'''
@@ -1464,10 +1463,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regrid3d.py
ESMP.ESMP_FieldRegridRelease(handle)
self.__curv_to_rect_handles.clear()
# Destroy any ESMP_Fields
-Index: pyferret-1.2.0/pyfermod/regrid/regrid3dexample.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid3dexample.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid3dexample.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid3dexample.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid3dexample.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid3dexample.py
@@ -4,12 +4,12 @@ and also serves as a coding example of u
@author: Karl Smith
@@ -1632,10 +1631,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regrid3dexample.py
printDiffs(curv_center_lons[:,:,1:-1],
curv_center_lats[:,:,1:-1],
curv_center_depths[:,:,1:-1],
-Index: pyferret-1.2.0/pyfermod/regrid/regrid3dtests.py
+Index: pyferret-7.0.0/pyfermod/regrid/regrid3dtests.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regrid3dtests.py
-+++ pyferret-1.2.0/pyfermod/regrid/regrid3dtests.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regrid3dtests.py
++++ pyferret-7.0.0/pyfermod/regrid/regrid3dtests.py
@@ -3,11 +3,12 @@ Unit tests for CurvRect3DRegridder
@author: Karl Smith
@@ -1757,10 +1756,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regrid3dtests.py
if mismatch_found:
self.fail("data mismatch found for patch regridding")
-Index: pyferret-1.2.0/pyfermod/regrid/regridtests.py
+Index: pyferret-7.0.0/pyfermod/regrid/regridtests.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/regrid/regridtests.py
-+++ pyferret-1.2.0/pyfermod/regrid/regridtests.py
+--- pyferret-7.0.0.orig/pyfermod/regrid/regridtests.py
++++ pyferret-7.0.0/pyfermod/regrid/regridtests.py
@@ -5,7 +5,8 @@ Tests of the regrid.__init__ functions
'''
import unittest
@@ -1771,10 +1770,10 @@ Index: pyferret-1.2.0/pyfermod/regrid/regridtests.py
class RegridTests(unittest.TestCase):
'''
-Index: pyferret-1.2.0/pyfermod/eofanal/eofdatapiece.py
+Index: pyferret-7.0.0/pyfermod/eofanal/eofdatapiece.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/eofanal/eofdatapiece.py
-+++ pyferret-1.2.0/pyfermod/eofanal/eofdatapiece.py
+--- pyferret-7.0.0.orig/pyfermod/eofanal/eofdatapiece.py
++++ pyferret-7.0.0/pyfermod/eofanal/eofdatapiece.py
@@ -6,7 +6,8 @@ Time Amplitude Funtion (TAF)
@author: Karl Smith
@@ -1831,10 +1830,10 @@ Index: pyferret-1.2.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.2.0/pyfermod/eofanal/eofdatasum.py
+Index: pyferret-7.0.0/pyfermod/eofanal/eofdatasum.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/eofanal/eofdatasum.py
-+++ pyferret-1.2.0/pyfermod/eofanal/eofdatasum.py
+--- pyferret-7.0.0.orig/pyfermod/eofanal/eofdatasum.py
++++ pyferret-7.0.0/pyfermod/eofanal/eofdatasum.py
@@ -8,7 +8,8 @@ Functions (EOFs) and their corresponding
@author: Karl Smith
'''
@@ -1891,10 +1890,10 @@ Index: pyferret-1.2.0/pyfermod/eofanal/eofdatasum.py
- print "sum %d different from input data" % lastone
+ print ("sum %d different from input data" % lastone)
-Index: pyferret-1.2.0/pyfermod/eofanal/__init__.py
+Index: pyferret-7.0.0/pyfermod/eofanal/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/eofanal/__init__.py
-+++ pyferret-1.2.0/pyfermod/eofanal/__init__.py
+--- pyferret-7.0.0.orig/pyfermod/eofanal/__init__.py
++++ pyferret-7.0.0/pyfermod/eofanal/__init__.py
@@ -6,5 +6,5 @@ especially for Python external functions
'''
@@ -1902,10 +1901,10 @@ Index: pyferret-1.2.0/pyfermod/eofanal/__init__.py
-from eofanalysis import InvalidStateError, EOFAnalysis
+from .eofanalysis import InvalidStateError, EOFAnalysis
-Index: pyferret-1.2.0/pyfermod/fershp/__init__.py
+Index: pyferret-7.0.0/pyfermod/fershp/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/fershp/__init__.py
-+++ pyferret-1.2.0/pyfermod/fershp/__init__.py
+--- pyferret-7.0.0.orig/pyfermod/fershp/__init__.py
++++ pyferret-7.0.0/pyfermod/fershp/__init__.py
@@ -2,6 +2,7 @@
Helper functions for pyferret shapefile external functions.
"""
@@ -1957,10 +1956,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/__init__.py
- print "addquadxyvalues: SUCCESS"
+ print ("addquadxyvalues: SUCCESS")
-Index: pyferret-1.2.0/pyfermod/fershp/mapprj.py
+Index: pyferret-7.0.0/pyfermod/fershp/mapprj.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/fershp/mapprj.py
-+++ pyferret-1.2.0/pyfermod/fershp/mapprj.py
+--- pyferret-7.0.0.orig/pyfermod/fershp/mapprj.py
++++ pyferret-7.0.0/pyfermod/fershp/mapprj.py
@@ -2,6 +2,8 @@
Map projection file utility functions
"""
@@ -1976,10 +1975,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/mapprj.py
- print "mapprj: SUCCESS"
+ print ("mapprj: SUCCESS")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxy.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_readxy.py
++++ pyferret-7.0.0/pyfermod/fershp/shapefile_readxy.py
@@ -4,6 +4,8 @@ coordinates from the points in the indic
The missing value separates coordinates between shapes.
"""
@@ -2023,10 +2022,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxy.py
+ print ("number of shapes = %d" % shape_num)
+ print ("shapefile_readxy: SUCCESS")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyval.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_readxyval.py
++++ pyferret-7.0.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.
"""
@@ -2078,10 +2077,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyval.py
- print "shapefile_readxyval: SUCCESS"
+ print ("shapefile_readxyval: SUCCESS")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyz.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_readxyz.py
++++ pyferret-7.0.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.
@@ -2100,10 +2099,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyz.py
+ print ("shapefile_readxyz: SUCCESS (limited)")
+ print (" run shapefile_writexyzval for full test")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyzval.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_readxyzval.py
++++ pyferret-7.0.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.
@@ -2136,10 +2135,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_readxyzval.py
+ print ("shapefile_readxyzval: SUCCESS (limited)")
+ print (" run shapefile_writexyzval for full test")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writeval.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_writeval.py
++++ pyferret-7.0.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.
@@ -2156,10 +2155,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writeval.py
- print "shapefile_writeval: SUCCESS (limited)"
+ print ("shapefile_writeval: SUCCESS (limited)")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyval.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_writexyval.py
++++ pyferret-7.0.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.
@@ -2186,10 +2185,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyval.py
- print "shapefile_writexyval: SUCCESS"
+ print ("shapefile_writexyval: SUCCESS")
-Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyzval.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/fershp/shapefile_writexyzval.py
++++ pyferret-7.0.0/pyfermod/fershp/shapefile_writexyzval.py
@@ -10,6 +10,8 @@ mentioned quadrilateral. Quadrilaterals
values are omitted from the shapefile.
"""
@@ -2232,10 +2231,10 @@ Index: pyferret-1.2.0/pyfermod/fershp/shapefile_writexyzval.py
os.remove("%s.dbf" % shapefilename)
os.remove("%s.shp" % shapefilename)
-Index: pyferret-1.2.0/pyfermod/graphbind/__init__.py
+Index: pyferret-7.0.0/pyfermod/graphbind/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/graphbind/__init__.py
-+++ pyferret-1.2.0/pyfermod/graphbind/__init__.py
+--- pyferret-7.0.0.orig/pyfermod/graphbind/__init__.py
++++ pyferret-7.0.0/pyfermod/graphbind/__init__.py
@@ -1,16 +1,17 @@
'''
+
@@ -2272,10 +2271,10 @@ Index: pyferret-1.2.0/pyfermod/graphbind/__init__.py
- print "Success"
-
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/__init__.py
+Index: pyferret-7.0.0/pyfermod/stats/__init__.py
===================================================================
---- pyferret-1.2.0.orig/pyfermod/stats/__init__.py
-+++ pyferret-1.2.0/pyfermod/stats/__init__.py
+--- pyferret-7.0.0.orig/pyfermod/stats/__init__.py
++++ pyferret-7.0.0/pyfermod/stats/__init__.py
@@ -1,6 +1,8 @@
"""
Helper functions for pyferret stats external functions.
@@ -3109,10 +3108,10 @@ Index: pyferret-1.2.0/pyfermod/stats/__init__.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_cdf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_cdf.py
++++ pyferret-7.0.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.
@@ -3136,10 +3135,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_cdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_chisquare.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_chisquare.py
++++ pyferret-7.0.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.
@@ -3188,10 +3187,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_chisquare.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_fit.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_fit.py
++++ pyferret-7.0.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.
@@ -3208,10 +3207,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_fit.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_helper.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_helper.py
++++ pyferret-7.0.0/pyfermod/stats/stats_helper.py
@@ -2,6 +2,8 @@
Returns an array of strings describing
the parameters for a probability distribution.
@@ -3239,10 +3238,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_helper.py
# Stop after printing an empty line
if not params_array[k]:
break;
-Index: pyferret-1.2.0/pyfermod/stats/stats_histogram.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_histogram.py
++++ pyferret-7.0.0/pyfermod/stats/stats_histogram.py
@@ -1,6 +1,7 @@
"""
Returns histogram bin counts for a given array of values.
@@ -3258,10 +3257,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_histogram.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_isf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_isf.py
++++ pyferret-7.0.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.
@@ -3285,10 +3284,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_isf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_kstest1.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_kstest1.py
++++ pyferret-7.0.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.
@@ -3321,10 +3320,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_kstest1.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_kstest2.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_kstest2.py
++++ pyferret-7.0.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.
@@ -3357,10 +3356,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_kstest2.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_linregress.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_linregress.py
++++ pyferret-7.0.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.
@@ -3377,10 +3376,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_linregress.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_norm_pdf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_norm_pdf.py
++++ pyferret-7.0.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.
@@ -3404,10 +3403,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_norm_pdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_pdf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_pdf.py
++++ pyferret-7.0.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.
@@ -3431,10 +3430,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_pdf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_pearsonr.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_pearsonr.py
++++ pyferret-7.0.0/pyfermod/stats/stats_pearsonr.py
@@ -2,6 +2,8 @@
Returns the Pearson product-moment correlation
coefficient between two samples of data.
@@ -3451,10 +3450,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_pearsonr.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_percentilesofscores.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_percentilesofscores.py
++++ pyferret-7.0.0/pyfermod/stats/stats_percentilesofscores.py
@@ -1,6 +1,8 @@
"""
Returns interpolated percentiles through a sample of scores (values)
@@ -3478,10 +3477,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_percentilesofscores.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_pmf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_pmf.py
++++ pyferret-7.0.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.
@@ -3505,10 +3504,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_pmf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_ppf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_ppf.py
++++ pyferret-7.0.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.
@@ -3532,10 +3531,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_ppf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_probplotvals.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_probplotvals.py
++++ pyferret-7.0.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.
@@ -3568,10 +3567,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_probplotvals.py
# All successful
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_rvs.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_rvs.py
++++ pyferret-7.0.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.
@@ -3588,10 +3587,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_rvs.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_scoresatpercentiles.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_scoresatpercentiles.py
++++ pyferret-7.0.0/pyfermod/stats/stats_scoresatpercentiles.py
@@ -1,6 +1,8 @@
"""
Returns interpolated scores (values) at percentiles through a sample
@@ -3615,10 +3614,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_scoresatpercentiles.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_sf.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_sf.py
++++ pyferret-7.0.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.
@@ -3642,10 +3641,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_sf.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_spearmanr.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_spearmanr.py
++++ pyferret-7.0.0/pyfermod/stats/stats_spearmanr.py
@@ -1,6 +1,8 @@
"""
Returns Spearman's rank correlation coefficient between two samples of data.
@@ -3662,10 +3661,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_spearmanr.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_stats.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_stats.py
++++ pyferret-7.0.0/pyfermod/stats/stats_stats.py
@@ -2,6 +2,8 @@
Returns the (unweighted) mean, variance, skew, and kurtoses
of an array of values
@@ -3682,10 +3681,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_stats.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_ttest1.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_ttest1.py
++++ pyferret-7.0.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).
@@ -3709,10 +3708,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_ttest1.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2ind.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_ttest2ind.py
++++ pyferret-7.0.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.
@@ -3745,10 +3744,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2ind.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2rel.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_ttest2rel.py
++++ pyferret-7.0.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.
@@ -3782,10 +3781,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_ttest2rel.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/stats/stats_zscore.py
+Index: pyferret-7.0.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
+--- pyferret-7.0.0.orig/pyfermod/stats/stats_zscore.py
++++ pyferret-7.0.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.
@@ -3809,62 +3808,10 @@ Index: pyferret-1.2.0/pyfermod/stats/stats_zscore.py
- print "Success"
+ print ("Success")
-Index: pyferret-1.2.0/pyfermod/ferrdataset.py
+Index: pyferret-7.0.0/pyfermod/libpyferret.c
===================================================================
---- 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
+--- pyferret-7.0.0.orig/pyfermod/libpyferret.c
++++ pyferret-7.0.0/pyfermod/libpyferret.c
@@ -42,6 +42,13 @@
#include <stdlib.h>
#include <string.h>
@@ -3935,7 +3882,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* for recovering from seg faults */
static void (*segv_handler)(int);
-@@ -158,9 +186,11 @@ static PyObject *pyferretStart(PyObject
+@@ -166,9 +194,11 @@ static PyObject *pyferretStart(PyObject
int ttoutLun = TTOUT_LUN;
int one_cmnd_mode_int;
PyObject *modulename;
@@ -3949,7 +3896,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
Py_INCREF(Py_False);
return Py_False;
}
-@@ -207,23 +237,23 @@ static PyObject *pyferretStart(PyObject
+@@ -223,23 +253,23 @@ static PyObject *pyferretStart(PyObject
/* Initial allocation of PPLUS memory */
pplMemSize = 0.5 * 1.0E6;
@@ -3981,7 +3928,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
if ( (metaname != NULL) || (unmappedFlag != 0) ) {
/*
-@@ -294,7 +324,10 @@ static PyObject *pyferretStart(PyObject
+@@ -310,7 +340,10 @@ static PyObject *pyferretStart(PyObject
set_one_cmnd_mode_(&one_cmnd_mode_int);
/* Success - return True */
@@ -3993,7 +3940,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
Py_INCREF(Py_True);
return Py_True;
}
-@@ -306,7 +339,7 @@ static PyObject *pyferretStart(PyObject
+@@ -322,7 +355,7 @@ static PyObject *pyferretStart(PyObject
* blksiz * PMAX_MEM_BLKS (defined in ferret.h as 2000)
* Returns: zero if fails, non-zero if successful
*/
@@ -4002,7 +3949,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
{
size_t actual_blksiz;
size_t newFerMemSize;
-@@ -325,20 +358,20 @@ static int resizeFerretMemory(int blksiz
+@@ -341,20 +374,20 @@ static int resizeFerretMemory(int blksiz
* realloc since the contents of the old memory isn't needed.
* This could also result in a better garbage collection.
*/
@@ -4031,7 +3978,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
return 1;
}
-@@ -348,14 +381,20 @@ static int resizeFerretMemory(int blksiz
+@@ -364,14 +397,20 @@ static int resizeFerretMemory(int blksiz
*/
void reallo_ppl_memory(int new_size)
{
@@ -4057,7 +4004,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
}
-@@ -381,8 +420,9 @@ static PyObject *pyferretResizeMemory(Py
+@@ -397,8 +436,9 @@ static PyObject *pyferretResizeMemory(Py
static char *argNames[] = {"memsize", NULL};
double mwMemSize;
@@ -4068,7 +4015,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
PyErr_SetString(PyExc_MemoryError, "Ferret not started");
return NULL;
}
-@@ -392,7 +432,7 @@ static PyObject *pyferretResizeMemory(Py
+@@ -408,7 +448,7 @@ static PyObject *pyferretResizeMemory(Py
return NULL;
/* Reallocate the new amount of memory for Ferret */
@@ -4077,7 +4024,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
Py_INCREF(Py_False);
return Py_False;
}
-@@ -437,9 +477,11 @@ static PyObject *pyferretRunCommand(PyOb
+@@ -453,9 +493,11 @@ static PyObject *pyferretRunCommand(PyOb
int cmnd_stack_level;
char errmsg[2112];
int errval;
@@ -4091,7 +4038,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
PyErr_SetString(PyExc_MemoryError, "Ferret not started");
return NULL;
}
-@@ -470,15 +512,15 @@ static PyObject *pyferretRunCommand(PyOb
+@@ -486,15 +528,15 @@ static PyObject *pyferretRunCommand(PyOb
do {
cmnd_stack_level = 0;
/* Run the Ferret command */
@@ -4110,7 +4057,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
}
cmnd_stack_level = sBuffer->flags[FRTN_IDATA2];
}
-@@ -580,9 +622,12 @@ static PyObject *pyferretGetData(PyObjec
+@@ -596,9 +638,12 @@ static PyObject *pyferretGetData(PyObjec
char axis_units[MAX_FERRET_NDIM][64];
char axis_names[MAX_FERRET_NDIM][64];
CALTYPE calendar_type;
@@ -4124,7 +4071,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
PyErr_SetString(PyExc_MemoryError, "Ferret not started");
return NULL;
}
-@@ -603,7 +648,7 @@ static PyObject *pyferretGetData(PyObjec
+@@ -619,7 +664,7 @@ static PyObject *pyferretGetData(PyObjec
* Retrieve the memory parameters describing the data array requested.
* Assumes Unix standard for passing strings to Fortran (appended array lengths).
*/
@@ -4133,16 +4080,16 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
steplo, stephi, incr, dataunit, &lendataunit, axis_types,
&badval, errmsg, &lenerrmsg, 1024, 64, 2112);
if ( lenerrmsg > 0 ) {
-@@ -642,7 +687,7 @@ static PyObject *pyferretGetData(PyObjec
+@@ -658,7 +703,7 @@ static PyObject *pyferretGetData(PyObjec
* Assign the data in the new ndarray.
* Note: if MAX_FERRET_NDIM changes, this needs editing.
*/
- ferdata = ferMemory + arraystart;
+ ferdata = module->ferMemory + arraystart;
- npydata = PyArray_DATA(data_ndarray);
+ npydata = (double *)PyArray_DATA(data_ndarray);
q = 0;
for (n = 0; n < (int)(shape[5]); n++) {
-@@ -875,7 +920,7 @@ static PyObject *pyferretPutData(PyObjec
+@@ -891,7 +936,7 @@ static PyObject *pyferretPutData(PyObjec
int len_errmsg;
/* If not initialized, raise a MemoryError */
@@ -4151,7 +4098,38 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
PyErr_SetString(PyExc_MemoryError, "Ferret not started");
return NULL;
}
-@@ -1143,14 +1188,16 @@ static char pyferretStopDocstring[] =
+@@ -1194,9 +1239,10 @@ static PyObject *pyferretGetStrData(PyOb
+ char axis_units[MAX_FERRET_NDIM][64];
+ char axis_names[MAX_FERRET_NDIM][64];
+ CALTYPE calendar_type;
+-
++ struct pyferret_module *module = MODULE_STATE(self);
++
+ /* If not initialized, raise a MemoryError */
+- if ( ! ferretInitialized ) {
++ if ( ! module->initialized ) {
+ PyErr_SetString(PyExc_MemoryError, "Ferret not started");
+ return NULL;
+ }
+@@ -1217,7 +1263,7 @@ static PyObject *pyferretGetStrData(PyOb
+ * Retrieve the memory parameters describing the data array requested.
+ * Assumes Unix standard for passing strings to Fortran (appended array lengths).
+ */
+- get_str_data_array_params_(dataname, &lendataname, ferMemory, &arraystart,
++ get_str_data_array_params_(dataname, &lendataname, module->ferMemory, &arraystart,
+ memlo, memhi, steplo, stephi, incr, axis_types,
+ errmsg, &lenerrmsg, 1024, 64, 2112);
+ if ( lenerrmsg > 0 ) {
+@@ -1250,7 +1296,7 @@ static PyObject *pyferretGetStrData(PyOb
+ */
+
+ /* Get the maximum string length of all the strings in this array */
+- ferdata = (void **) (ferMemory + arraystart);
++ ferdata = (void **) (module->ferMemory + arraystart);
+ /* Use STRING_MISSING_VALUE for missing strings */
+ maxstrlen = (int)(strlen(STRING_MISSING_VALUE) + 1);
+ for (n = 0; n < (int)(shape[5]); n++) {
+@@ -1485,14 +1531,16 @@ static char pyferretStopDocstring[] =
static PyObject *pyferretStop(PyObject *self)
{
@@ -4170,7 +4148,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* Release the references to the pyferret and pyferret.graphbind modules */
Py_DECREF(pyferret_graphbind_module_pyobject);
-@@ -1159,24 +1206,24 @@ static PyObject *pyferretStop(PyObject *
+@@ -1501,24 +1549,24 @@ static PyObject *pyferretStop(PyObject *
pyferret_module_pyobject = NULL;
/* Run commands to clear/reset Ferret's state */
@@ -4208,7 +4186,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* Return True */
Py_INCREF(Py_True);
-@@ -1200,14 +1247,15 @@ static char pyferretQuitDocstring[] =
+@@ -1542,14 +1590,15 @@ static char pyferretQuitDocstring[] =
static PyObject *pyferretQuit(PyObject *self)
{
@@ -4226,7 +4204,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* Release the references to the pyferret and pyferret.graphbind modules */
Py_DECREF(pyferret_graphbind_module_pyobject);
-@@ -1216,17 +1264,17 @@ static PyObject *pyferretQuit(PyObject *
+@@ -1558,17 +1607,17 @@ static PyObject *pyferretQuit(PyObject *
pyferret_module_pyobject = NULL;
/* Let Ferret do its orderly shutdown - including closing viewers */
@@ -4250,7 +4228,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* Return None */
Py_INCREF(Py_None);
-@@ -1791,8 +1839,37 @@ static struct PyMethodDef pyferretMethod
+@@ -2134,8 +2183,37 @@ static struct PyMethodDef pyferretMethod
static char pyferretModuleDocstring[] =
"An extension module enabling the use of Ferret from Python \n";
@@ -4288,7 +4266,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
{
char names[64][32];
int values[64];
-@@ -1800,7 +1877,11 @@ PyMODINIT_FUNC initlibpyferret(void)
+@@ -2143,7 +2221,11 @@ PyMODINIT_FUNC initlibpyferret(void)
int k;
/* Create the module with the indicated methods */
@@ -4300,7 +4278,7 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
/* Add ferret parameter values */
get_ferret_params_(names, values, &numvals);
-@@ -1851,5 +1932,10 @@ PyMODINIT_FUNC initlibpyferret(void)
+@@ -2205,5 +2287,10 @@ PyMODINIT_FUNC initlibpyferret(void)
/* Private parameter return value from libpyferret._run indicating the program should shut down */
PyModule_AddIntConstant(mod, "_FERR_EXIT_PROGRAM", FERR_EXIT_PROGRAM);
@@ -4311,10 +4289,10 @@ Index: pyferret-1.2.0/pyfermod/libpyferret.c
+#endif
}
-Index: pyferret-1.2.0/pyfermod/pyefcn_result_limits.c
+Index: pyferret-7.0.0/pyfermod/pyefcn_result_limits.c
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyefcn_result_limits.c
-+++ pyferret-1.2.0/pyfermod/pyefcn_result_limits.c
+--- pyferret-7.0.0.orig/pyfermod/pyefcn_result_limits.c
++++ pyferret-7.0.0/pyfermod/pyefcn_result_limits.c
@@ -39,6 +39,11 @@
#include "pyferret.h"
#include "EF_Util.h"
@@ -4327,10 +4305,10 @@ Index: pyferret-1.2.0/pyfermod/pyefcn_result_limits.c
static const char *AXIS_NAMES[MAX_FERRET_NDIM] = { "X", "Y", "Z", "T", "E", "F" };
/*
-Index: pyferret-1.2.0/fer/grdel/window.c
+Index: pyferret-7.0.0/fer/grdel/window.c
===================================================================
---- pyferret-1.2.0.orig/fer/grdel/window.c
-+++ pyferret-1.2.0/fer/grdel/window.c
+--- pyferret-7.0.0.orig/fer/grdel/window.c
++++ pyferret-7.0.0/fer/grdel/window.c
@@ -24,6 +24,9 @@
#include "cferbind.h"
#include "pyferret.h"
@@ -4341,10 +4319,10 @@ Index: pyferret-1.2.0/fer/grdel/window.c
#ifdef VERBOSEDEBUG
#include <stdio.h>
-Index: pyferret-1.2.0/pyfermod/pyefcn_compute.c
+Index: pyferret-7.0.0/pyfermod/pyefcn_compute.c
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyefcn_compute.c
-+++ pyferret-1.2.0/pyfermod/pyefcn_compute.c
+--- pyferret-7.0.0.orig/pyfermod/pyefcn_compute.c
++++ pyferret-7.0.0/pyfermod/pyefcn_compute.c
@@ -42,6 +42,12 @@
#include "pyferret.h"
#include "EF_Util.h"
@@ -4358,10 +4336,10 @@ Index: pyferret-1.2.0/pyfermod/pyefcn_compute.c
/*
* See pyferret.h for information on this function
*/
-Index: pyferret-1.2.0/pyfermod/pyefcn_init.c
+Index: pyferret-7.0.0/pyfermod/pyefcn_init.c
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyefcn_init.c
-+++ pyferret-1.2.0/pyfermod/pyefcn_init.c
+--- pyferret-7.0.0.orig/pyfermod/pyefcn_init.c
++++ pyferret-7.0.0/pyfermod/pyefcn_init.c
@@ -39,6 +39,12 @@
#include "pyferret.h"
#include "EF_Util.h"
@@ -4375,10 +4353,10 @@ Index: pyferret-1.2.0/pyfermod/pyefcn_init.c
static const char *AXIS_NAMES[MAX_FERRET_NDIM] = { "X", "Y", "Z", "T", "E", "F" };
/*
-Index: pyferret-1.2.0/pyfermod/pyefcn_get_error.c
+Index: pyferret-7.0.0/pyfermod/pyefcn_get_error.c
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyefcn_get_error.c
-+++ pyferret-1.2.0/pyfermod/pyefcn_get_error.c
+--- pyferret-7.0.0.orig/pyfermod/pyefcn_get_error.c
++++ pyferret-7.0.0/pyfermod/pyefcn_get_error.c
@@ -35,6 +35,10 @@
#include <Python.h>
#include "pyferret.h"
@@ -4390,10 +4368,10 @@ Index: pyferret-1.2.0/pyfermod/pyefcn_get_error.c
/*
* See pyferret.h for information on this function
*/
-Index: pyferret-1.2.0/pyfermod/pyefcn_custom_axes.c
+Index: pyferret-7.0.0/pyfermod/pyefcn_custom_axes.c
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyefcn_custom_axes.c
-+++ pyferret-1.2.0/pyfermod/pyefcn_custom_axes.c
+--- pyferret-7.0.0.orig/pyfermod/pyefcn_custom_axes.c
++++ pyferret-7.0.0/pyfermod/pyefcn_custom_axes.c
@@ -39,6 +39,11 @@
#include "pyferret.h"
#include "EF_Util.h"
@@ -4406,10 +4384,10 @@ Index: pyferret-1.2.0/pyfermod/pyefcn_custom_axes.c
static const char *AXIS_NAMES[MAX_FERRET_NDIM] = { "X", "Y", "Z", "T", "E", "F" };
/*
-Index: pyferret-1.2.0/pyfermod/pyferret.h
+Index: pyferret-7.0.0/pyfermod/pyferret.h
===================================================================
---- pyferret-1.2.0.orig/pyfermod/pyferret.h
-+++ pyferret-1.2.0/pyfermod/pyferret.h
+--- pyferret-7.0.0.orig/pyfermod/pyferret.h
++++ pyferret-7.0.0/pyfermod/pyferret.h
@@ -1,8 +1,6 @@
#ifndef PYFERRET_H_
#define PYFERRET_H_
@@ -4419,13 +4397,13 @@ Index: pyferret-1.2.0/pyfermod/pyferret.h
/* Ferret memory cache */
extern double *memory;
-Index: pyferret-1.2.0/setup.py
+Index: pyferret-7.0.0/setup.py
===================================================================
---- pyferret-1.2.0.orig/setup.py
-+++ pyferret-1.2.0/setup.py
-@@ -56,7 +56,11 @@ lib_list.extend(fer_lib_list)
- lib_list.extend(fer_lib_list)
- lib_list.extend(fer_lib_list)
+--- pyferret-7.0.0.orig/setup.py
++++ pyferret-7.0.0/setup.py
+@@ -74,7 +74,11 @@ if buildtype != "intel-mac":
+ lib_list.extend(fer_lib_list)
+ lib_list.extend(fer_lib_list)
# Add required system libraries to the list to link in
-lib_list.append("python%i.%i" % sys.version_info[:2])
+ver = sys.version_info[:2]
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index ac3ecfc..7b25b77 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -3,29 +3,28 @@ Description: Hard-code platform, date for reproducible builds
Last-Updated: 2016-07-07
Forwarded: no
-Index: pyferret-1.2.0/fer/Makefile
+Index: pyferret-7.0.0/fer/Makefile
===================================================================
---- pyferret-1.2.0.orig/fer/Makefile
-+++ pyferret-1.2.0/fer/Makefile
-@@ -13,9 +13,12 @@ include ../site_specific.mk
+--- pyferret-7.0.0.orig/fer/Makefile
++++ pyferret-7.0.0/fer/Makefile
+@@ -13,8 +13,11 @@ include ../site_specific.mk
#
include ../platform_specific.mk.$(BUILDTYPE)
-PLATFORM := $(shell uname -rs)
- VERSION_INFO := (PyFerret $(PYFERRET_VERSION))
-DATE := $(shell /bin/date +%D)
+# Hard-code these for bit-reproducible builds
+# PLATFORM := $(shell uname -rs)
+# DATE := $(shell /bin/date +%D)
+PLATFORM := Debian
-+DATE:= 12/0/15
++DATE:= 6/30/16
#
# Macros
-Index: pyferret-1.2.0/fer/grdel/window.c
+Index: pyferret-7.0.0/fer/grdel/window.c
===================================================================
---- pyferret-1.2.0.orig/fer/grdel/window.c
-+++ pyferret-1.2.0/fer/grdel/window.c
+--- pyferret-7.0.0.orig/fer/grdel/window.c
++++ pyferret-7.0.0/fer/grdel/window.c
@@ -54,6 +54,9 @@ static void openlogfile(void)
}
#endif /* VERBOSEDEBUG */
diff --git a/debian/patches/set-envvars.patch b/debian/patches/set-envvars.patch
index 5f62cb3..122574e 100644
--- a/debian/patches/set-envvars.patch
+++ b/debian/patches/set-envvars.patch
@@ -3,13 +3,13 @@ Description: Ensure pyferret can run without Environmental variables set
Last-Updated: 2015-05-11
Forwarded: no
-Index: pyferret-1.1.0/pyfermod/__init__.py
+Index: pyferret-7.0.0/pyfermod/__init__.py
===================================================================
---- pyferret-1.1.0.orig/pyfermod/__init__.py
-+++ pyferret-1.1.0/pyfermod/__init__.py
-@@ -47,6 +47,21 @@ import numpy
- import numpy.ma
- import StringIO
+--- pyferret-7.0.0.orig/pyfermod/__init__.py
++++ pyferret-7.0.0/pyfermod/__init__.py
+@@ -39,6 +39,21 @@ except ImportError:
+ pass
+ import readline
+# In Debian, an application should be able to start without environmental
+# variables needing to be set. So set them here.
@@ -26,6 +26,6 @@ Index: pyferret-1.1.0/pyfermod/__init__.py
+if os.environ.get('FER_LIBS') is None:
+ os.environ['FER_LIBS'] = '/usr/lib/ferret-vis/efmem:/usr/lib/ferret-vis/external_functions'
+
- # import everything from libpyferret so constants
- # in that module are seen as part of this module
- from libpyferret import *
+ import libpyferret
+ # also import everything (not starting with an underscore) from libpyferret
+ # so constants in that module are seen as part of this module
--
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