summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2018-02-27 08:55:11 -0800
committerGitHub <noreply@github.com>2018-02-27 08:55:11 -0800
commit042886c4369956db23d4d05a5cbe7baa4fb9f86b (patch)
treed6d02b3aac02a97fc1df922a88e152b166080258
parentbd882cb6486f3d9dd3141dd58f0fb2e3a6c7cb3c (diff)
parentefc0e6438ac18175c9d9ae695374c945d4bd2211 (diff)
downloadnumpy-042886c4369956db23d4d05a5cbe7baa4fb9f86b.tar.gz
Merge pull request #10671 from luzpaz/more-misc-typos
DOC/MAINT: More misc. typos
-rw-r--r--doc/RELEASE_WALKTHROUGH.rst.txt2
-rw-r--r--doc/changelog/1.14.1-changelog.rst2
-rw-r--r--doc/release/1.14.1-notes.rst2
-rw-r--r--numpy/core/src/umath/override.c4
-rw-r--r--numpy/core/tests/test_indexing.py2
-rw-r--r--numpy/core/tests/test_multiarray.py8
-rw-r--r--numpy/testing/nose_tools/parameterized.py4
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/RELEASE_WALKTHROUGH.rst.txt b/doc/RELEASE_WALKTHROUGH.rst.txt
index df8c9c45a..81e15f91f 100644
--- a/doc/RELEASE_WALKTHROUGH.rst.txt
+++ b/doc/RELEASE_WALKTHROUGH.rst.txt
@@ -102,7 +102,7 @@ to forgo the signing in the future::
$ twine upload -s release/installers/numpy-1.14.1.zip # Upload last.
If one of the commands breaks in the middle, which is not uncommon, you may
-need to selectively upload the remaining files becuase PyPI does not allow the
+need to selectively upload the remaining files because PyPI does not allow the
same file to be uploaded twice. The source file should be uploaded last to
avoid synchronization problems if pip users access the files while this is in
process. Note that PyPI only allows a single source distribution, here we have
diff --git a/doc/changelog/1.14.1-changelog.rst b/doc/changelog/1.14.1-changelog.rst
index 71424cb15..be466ab52 100644
--- a/doc/changelog/1.14.1-changelog.rst
+++ b/doc/changelog/1.14.1-changelog.rst
@@ -58,6 +58,6 @@ A total of 36 pull requests were merged for this release.
* `#10610 <https://github.com/numpy/numpy/pull/10610>`__: BUG: Align type definition with generated lapack
* `#10612 <https://github.com/numpy/numpy/pull/10612>`__: BUG/ENH: Improve output for structured non-void types
* `#10622 <https://github.com/numpy/numpy/pull/10622>`__: BUG: deallocate recursive closure in arrayprint.py (1.14 backport)
-* `#10624 <https://github.com/numpy/numpy/pull/10624>`__: BUG: Correctly identify comma seperated dtype strings
+* `#10624 <https://github.com/numpy/numpy/pull/10624>`__: BUG: Correctly identify comma separated dtype strings
* `#10629 <https://github.com/numpy/numpy/pull/10629>`__: BUG: deallocate recursive closure in arrayprint.py (backport...
* `#10630 <https://github.com/numpy/numpy/pull/10630>`__: REL: Prepare for 1.14.1 release.
diff --git a/doc/release/1.14.1-notes.rst b/doc/release/1.14.1-notes.rst
index c280c94cd..2ed4c3e14 100644
--- a/doc/release/1.14.1-notes.rst
+++ b/doc/release/1.14.1-notes.rst
@@ -87,6 +87,6 @@ A total of 36 pull requests were merged for this release.
* `#10610 <https://github.com/numpy/numpy/pull/10610>`__: BUG: Align type definition with generated lapack
* `#10612 <https://github.com/numpy/numpy/pull/10612>`__: BUG/ENH: Improve output for structured non-void types
* `#10622 <https://github.com/numpy/numpy/pull/10622>`__: BUG: deallocate recursive closure in arrayprint.py (1.14 backport)
-* `#10624 <https://github.com/numpy/numpy/pull/10624>`__: BUG: Correctly identify comma seperated dtype strings
+* `#10624 <https://github.com/numpy/numpy/pull/10624>`__: BUG: Correctly identify comma separated dtype strings
* `#10629 <https://github.com/numpy/numpy/pull/10629>`__: BUG: deallocate recursive closure in arrayprint.py (backport...
* `#10630 <https://github.com/numpy/numpy/pull/10630>`__: REL: Prepare for 1.14.1 release.
diff --git a/numpy/core/src/umath/override.c b/numpy/core/src/umath/override.c
index 7e787b8fe..0aef093b0 100644
--- a/numpy/core/src/umath/override.c
+++ b/numpy/core/src/umath/override.c
@@ -210,7 +210,7 @@ normalize_reduceat_args(PyUFuncObject *ufunc, PyObject *args,
PyObject **normal_args, PyObject **normal_kwds)
{
/*
- * ufunc.reduceat(a, indicies[, axis, dtype, out])
+ * ufunc.reduceat(a, indices[, axis, dtype, out])
* the number of arguments has been checked in PyUFunc_GenericReduction.
*/
npy_intp i;
@@ -224,7 +224,7 @@ normalize_reduceat_args(PyUFuncObject *ufunc, PyObject *args,
"arguments but %"NPY_INTP_FMT" were given", nargs);
return -1;
}
- /* a and indicies */
+ /* a and indices */
*normal_args = PyTuple_GetSlice(args, 0, 2);
if (*normal_args == NULL) {
return -1;
diff --git a/numpy/core/tests/test_indexing.py b/numpy/core/tests/test_indexing.py
index df9eca627..cd4ea611a 100644
--- a/numpy/core/tests/test_indexing.py
+++ b/numpy/core/tests/test_indexing.py
@@ -808,7 +808,7 @@ class TestMultiIndexingAutomated(object):
`arr[indices]` should be identical.
no_copy : bool
Whether the indexing operation requires a copy. If this is `True`,
- `np.may_share_memory(arr, arr[indicies])` should be `True` (with
+ `np.may_share_memory(arr, arr[indices])` should be `True` (with
some exceptions for scalars and possibly 0-d arrays).
Notes
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index b3515ae6e..fba169ebf 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -1520,9 +1520,9 @@ class TestMethods(object):
assert_equal(c, ai, msg)
# test sorting of complex arrays requiring byte-swapping, gh-5441
- for endianess in '<>':
+ for endianness in '<>':
for dt in np.typecodes['Complex']:
- arr = np.array([1+3.j, 2+2.j, 3+1.j], dtype=endianess + dt)
+ arr = np.array([1+3.j, 2+2.j, 3+1.j], dtype=endianness + dt)
c = arr.copy()
c.sort()
msg = 'byte-swapped complex sort, dtype={0}'.format(dt)
@@ -1778,9 +1778,9 @@ class TestMethods(object):
assert_equal(bi.copy().argsort(kind=kind), b, msg)
# test argsort of complex arrays requiring byte-swapping, gh-5441
- for endianess in '<>':
+ for endianness in '<>':
for dt in np.typecodes['Complex']:
- arr = np.array([1+3.j, 2+2.j, 3+1.j], dtype=endianess + dt)
+ arr = np.array([1+3.j, 2+2.j, 3+1.j], dtype=endianness + dt)
msg = 'byte-swapped complex argsort, dtype={0}'.format(dt)
assert_equal(arr.argsort(),
np.arange(len(arr), dtype=np.intp), msg)
diff --git a/numpy/testing/nose_tools/parameterized.py b/numpy/testing/nose_tools/parameterized.py
index d094f7c7f..53e67517d 100644
--- a/numpy/testing/nose_tools/parameterized.py
+++ b/numpy/testing/nose_tools/parameterized.py
@@ -456,8 +456,8 @@ class parameterized(object):
frame = stack[1]
frame_locals = frame[0].f_locals
- paramters = cls.input_as_callable(input)()
- for num, p in enumerate(paramters):
+ parameters = cls.input_as_callable(input)()
+ for num, p in enumerate(parameters):
name = name_func(f, num, p)
frame_locals[name] = cls.param_as_standalone_func(p, f, name)
frame_locals[name].__doc__ = doc_func(f, num, p)