Merge pull request #10 from ocefpaf/scipy

Scipy

pywafo/.project

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>svn_pywafo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>svn_pywafo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

pywafo/.pydevproject

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>

pywafo/src/wafo/stats/_binned_statistic.py

@@ -3,7 +3,7 @@ from __future__ import division, print_function, absolute_import
 import warnings
 
 import numpy as np
-from scipy.lib.six import callable
+from scipy._lib.six import callable
 
 
 def binned_statistic(x, values, statistic='mean',

pywafo/src/wafo/stats/_distn_infrastructure.py

@@ -4,7 +4,7 @@
 #
 from __future__ import division, print_function, absolute_import
 
-from scipy.lib.six import string_types, exec_
+from scipy._lib.six import string_types, exec_
 
 import sys
 import keyword
@@ -2011,7 +2011,7 @@ class rv_continuous(rv_generic):
         return output
 
     def link(self, x, logSF, theta, i):
-        ''' 
+        '''
         Return theta[i] as function of quantile, survival probability and
             theta[j] for j!=i.
 
@@ -2034,7 +2034,7 @@ class rv_continuous(rv_generic):
             theta[i] = link(x, logSF, theta, i),
         where logSF = log(Prob(X>x; theta)).
 
-        See also 
+        See also
         estimation.Profile
         '''
         return self._link(x, logSF, theta, i)
@@ -2288,7 +2288,7 @@ class rv_continuous(rv_generic):
 
         # invert the Hessian matrix (i.e. invert the observed information number)
         #pcov = -pinv(H);
-        return - H    
+        return - H
 
     # return starting point for fit (shape arguments + loc + scale)
     def _fitstart(self, data, args=None):

pywafo/src/wafo/stats/_numpy_compat.py

@@ -7,7 +7,7 @@ import warnings
 
 import numpy as np
 
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 
 if NumpyVersion(np.__version__) > '1.7.0.dev':
     _assert_warns = np.testing.assert_warns

pywafo/src/wafo/stats/kde.py

@@ -23,7 +23,7 @@ from __future__ import division, print_function, absolute_import
 import warnings
 
 # Scipy imports.
-from scipy.lib.six import callable, string_types
+from scipy._lib.six import callable, string_types
 from scipy import linalg, special
 
 from numpy import atleast_2d, reshape, zeros, newaxis, dot, exp, pi, sqrt, \

pywafo/src/wafo/stats/morestats.py

@@ -13,7 +13,7 @@ from numpy import (isscalar, r_, log, sum, around, unique, asarray,
      floor, array, poly1d, compress, not_equal, pi, exp, ravel, angle)
 from numpy.testing.decorators import setastest
 
-from scipy.lib.six import string_types
+from scipy._lib.six import string_types
 from ._numpy_compat import count_nonzero
 from scipy import optimize
 from scipy import special
@@ -2066,7 +2066,7 @@ def median_test(*args, **kwds):
     References
     ----------
     .. [1] Mood, A. M., Introduction to the Theory of Statistics. McGraw-Hill
-        (1950), pp. 394-399. 
+        (1950), pp. 394-399.
     .. [2] Zar, J. H., Biostatistical Analysis, 5th ed. Prentice Hall (2010).
         See Sections 8.12 and 10.15.
 
@@ -2100,7 +2100,7 @@ def median_test(*args, **kwds):
            [11,  5, 10]])
 
     `p` is too large to conclude that the medians are not the same:
-    
+
     >>> p
     0.12609082774093244
 
@@ -2120,7 +2120,7 @@ def median_test(*args, **kwds):
 
     >>> tbl
     array([[ 5, 11,  9],
-           [11,  4,  8]]) 
+           [11,  4,  8]])
 
     This example demonstrates that if the data set is not large and there
     are values equal to the median, the p-value can be sensitive to the

pywafo/src/wafo/stats/mstats_basic.py

@@ -40,7 +40,7 @@ from numpy import ndarray
 import numpy.ma as ma
 from numpy.ma import masked, nomask
 
-from scipy.lib.six import iteritems
+from scipy._lib.six import iteritems
 
 import itertools
 import warnings

pywafo/src/wafo/stats/stats.py

@@ -171,13 +171,13 @@ from __future__ import division, print_function, absolute_import
 import warnings
 import math
 
-from scipy.lib.six import xrange
+from scipy._lib.six import xrange
 
 # friedmanchisquare patch uses python sum
 pysum = sum  # save it before it gets overwritten
 
 # Scipy imports.
-from scipy.lib.six import callable, string_types
+from scipy._lib.six import callable, string_types
 from numpy import array, asarray, ma, zeros, sum
 import scipy.special as special
 import scipy.linalg as linalg

pywafo/src/wafo/stats/tests/common_tests.py

@@ -6,7 +6,7 @@ import warnings
 import numpy as np
 import numpy.testing as npt
 
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 from wafo import stats
 
 

pywafo/src/wafo/stats/tests/test_discrete_basic.py

@@ -2,7 +2,7 @@ from __future__ import division, print_function, absolute_import
 
 import numpy.testing as npt
 import numpy as np
-from scipy.lib.six import xrange
+from scipy._lib.six import xrange
 
 from wafo import stats
 from wafo.stats.tests.common_tests import (check_normalization, check_moment,

pywafo/src/wafo/stats/tests/test_distributions.py

@@ -15,7 +15,7 @@ from nose import SkipTest
 import numpy
 import numpy as np
 from numpy import typecodes, array
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 from scipy import special
 import wafo.stats as stats
 from wafo.stats._distn_infrastructure import argsreduce
@@ -512,7 +512,7 @@ class TestGenpareto(TestCase):
         assert_allclose(rv.logpdf(1), 0)
 
     def test_x_inf(self):
-        # make sure x=inf is handled gracefully 
+        # make sure x=inf is handled gracefully
         rv = stats.genpareto(c=0.1)
         assert_allclose([rv.pdf(np.inf), rv.cdf(np.inf)], [0., 1.])
         assert_(np.isneginf(rv.logpdf(np.inf)))