diff options
author | alex <argriffi@ncsu.edu> | 2014-02-27 10:50:25 -0500 |
---|---|---|
committer | alex <argriffi@ncsu.edu> | 2014-02-27 10:50:25 -0500 |
commit | 1f2771cc7170abee173849da7028ed02cb8e531f (patch) | |
tree | 7930afd71b8baf5884742f32dec2f2ec10103137 | |
parent | 3a2f048b830822e8395f0d42c42b8fd395a14204 (diff) | |
download | numpy-1f2771cc7170abee173849da7028ed02cb8e531f.tar.gz |
DOC: some versionadded notes
-rw-r--r-- | numpy/lib/npyio.py | 4 | ||||
-rw-r--r-- | numpy/testing/utils.py | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index af259cfef..8cd779f4d 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -668,6 +668,7 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, The returned array will have at least `ndmin` dimensions. Otherwise mono-dimensional axes will be squeezed. Legal values: 0 (default), 1 or 2. + .. versionadded:: 1.6.0 Returns @@ -911,14 +912,17 @@ def savetxt(fname, X, fmt='%.18e', delimiter=' ', newline='\n', header='', .. versionadded:: 1.5.0 header : str, optional String that will be written at the beginning of the file. + .. versionadded:: 1.7.0 footer : str, optional String that will be written at the end of the file. + .. versionadded:: 1.7.0 comments : str, optional String that will be prepended to the ``header`` and ``footer`` strings, to mark them as comments. Default: '# ', as expected by e.g. ``numpy.loadtxt``. + .. versionadded:: 1.7.0 Character separating lines. diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 97908c7e8..36d6dbc13 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -1156,6 +1156,8 @@ def assert_allclose(actual, desired, rtol=1e-7, atol=0, It compares the difference between `actual` and `desired` to ``atol + rtol * abs(desired)``. + .. versionadded:: 1.5.0 + Parameters ---------- actual : array_like @@ -1465,6 +1467,7 @@ class WarningManager(object): self._module.filters = self._filters self._module.showwarning = self._showwarning + def assert_warns(warning_class, func, *args, **kw): """ Fail unless the given callable throws the specified warning. @@ -1474,6 +1477,8 @@ def assert_warns(warning_class, func, *args, **kw): If a different type of warning is thrown, it will not be caught, and the test case will be deemed to have suffered an error. + .. versionadded:: 1.4.0 + Parameters ---------- warning_class : class @@ -1505,6 +1510,8 @@ def assert_no_warnings(func, *args, **kw): """ Fail if the given callable produces any warnings. + .. versionadded:: 1.8.0 + Parameters ---------- func : callable |