Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 21552d9

Browse filesBrowse files
timhoffmtimhoffm
authored
Merge pull request matplotlib#15593 from meeseeksmachine/auto-backport-of-pr-15590-on-v3.2.x
Backport PR matplotlib#15590 on branch v3.2.x (Rename numpy to NumPy in docs.)
2 parents 64d38d6 + 696bbe4 commit 21552d9
Copy full SHA for 21552d9

File tree

Expand file treeCollapse file tree

8 files changed

+14
-14
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+14
-14
lines changed

‎doc/api/prev_api_changes/api_changes_0.99.rst

Copy file name to clipboardExpand all lines: doc/api/prev_api_changes/api_changes_0.99.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Changes in 0.99
44
* pylab no longer provides a load and save function. These are
55
available in matplotlib.mlab, or you can use numpy.loadtxt and
66
numpy.savetxt for text files, or np.save and np.load for binary
7-
numpy arrays.
7+
NumPy arrays.
88

99
* User-generated colormaps can now be added to the set recognized
1010
by :func:`matplotlib.cm.get_cmap`. Colormaps can be made the

‎doc/api/prev_api_changes/api_changes_1.4.x.rst

Copy file name to clipboardExpand all lines: doc/api/prev_api_changes/api_changes_1.4.x.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ original location:
169169
Previously an integer start-index and stride-length could be specified using
170170
either a two-element-list or a two-element-tuple. Now this can only be done
171171
using a two-element-tuple. If a two-element-list is used then it will be
172-
treated as numpy fancy indexing and only the two markers corresponding to the
172+
treated as NumPy fancy indexing and only the two markers corresponding to the
173173
given indexes will be shown.
174174

175175
* Removed *prop* keyword argument from
@@ -207,6 +207,6 @@ original location:
207207
Code removal
208208
------------
209209

210-
* Removed ``mlab.levypdf``. The code raised a numpy error (and has for
210+
* Removed ``mlab.levypdf``. The code raised a NumPy error (and has for
211211
a long time) and was not the standard form of the Levy distribution.
212212
``scipy.stats.levy`` should be used instead

‎doc/api/prev_api_changes/api_changes_3.1.0.rst

Copy file name to clipboardExpand all lines: doc/api/prev_api_changes/api_changes_3.1.0.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,9 +715,9 @@ likewise changed.
715715
Dependency changes
716716
------------------
717717

718-
numpy
718+
NumPy
719719
~~~~~
720-
Matplotlib 3.1 now requires numpy>=1.11.
720+
Matplotlib 3.1 now requires NumPy>=1.11.
721721

722722
ghostscript
723723
~~~~~~~~~~~
@@ -871,7 +871,7 @@ future version.
871871
- `.cbook.iterable`
872872
- `.cbook.get_label`
873873
- `.cbook.safezip`
874-
Manually check the lengths of the inputs instead, or rely on numpy to do it.
874+
Manually check the lengths of the inputs instead, or rely on NumPy to do it.
875875
- `.cbook.is_hashable`
876876
Use ``isinstance(..., collections.abc.Hashable)`` instead.
877877

‎doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plotfile
1212
~~~~~~~~
1313
`.pyplot.plotfile` is deprecated in favor of separately loading and plotting
1414
the data. See :doc:`/gallery/misc/plotfile_demo_sgskip` for various ways to
15-
use pandas or numpy to load data, and pandas or matplotlib to plot the
15+
use pandas or NumPy to load data, and pandas or matplotlib to plot the
1616
resulting data.
1717

1818
axes and axis
@@ -220,7 +220,7 @@ is now available to register a font at a given path.
220220

221221
The ``as_str``, ``as_rgba_str``, ``as_array``, ``get_width`` and ``get_height``
222222
methods of ``matplotlib.ft2font.FT2Image`` are deprecated. Convert the ``FT2Image``
223-
to a numpy array with ``np.asarray`` before processing it.
223+
to a NumPy array with ``np.asarray`` before processing it.
224224

225225
Colors
226226
~~~~~~

‎doc/devel/MEP/MEP28.rst

Copy file name to clipboardExpand all lines: doc/devel/MEP/MEP28.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following lists any open PRs or branches related to this MEP:
1717

1818
#. Deprecate redundant statistical kwargs in ``Axes.boxplot``: https://github.com/phobson/matplotlib/tree/MEP28-initial-deprecations
1919
#. Deprecate redundant style options in ``Axes.boxplot``: https://github.com/phobson/matplotlib/tree/MEP28-initial-deprecations
20-
#. Deprecate passings 2D numpy arrays as input: None
20+
#. Deprecate passings 2D NumPy arrays as input: None
2121
#. Add pre- & post-processing options to ``cbook.boxplot_stats``: https://github.com/phobson/matplotlib/tree/boxplot-stat-transforms
2222
#. Exposing ``cbook.boxplot_stats`` through ``Axes.boxplot`` kwargs: None
2323
#. Remove redundant statistical kwargs in ``Axes.boxplot``: None
@@ -197,9 +197,9 @@ Schedule
197197
An accelerated timeline could look like the following:
198198

199199
#. v2.0.1 add transforms to ``cbook.boxplots_stats``, expose in ``Axes.boxplot``
200-
#. v2.1.0 Initial Deprecations , and using 2D numpy arrays as input
200+
#. v2.1.0 Initial Deprecations , and using 2D NumPy arrays as input
201201

202-
a. Using 2D numpy arrays as input. The semantics around 2D arrays are generally confusing.
202+
a. Using 2D NumPy arrays as input. The semantics around 2D arrays are generally confusing.
203203
b. ``usermedians``, ``conf_intervals``, ``sym`` parameters
204204

205205
#. v2.2.0

‎doc/devel/min_dep_policy.rst

Copy file name to clipboardExpand all lines: doc/devel/min_dep_policy.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ releases. For projects that use date-based versioning, every release
1010
is a 'minor version'.
1111

1212

13-
Python and numpy
13+
Python and NumPy
1414
================
1515

1616
- support minor versions of ``Python`` initially released

‎doc/users/event_handling.rst

Copy file name to clipboardExpand all lines: doc/users/event_handling.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Picking exercise
519519

520520
Create a data set of 100 arrays of 1000 Gaussian random numbers and
521521
compute the sample mean and standard deviation of each of them (hint:
522-
numpy arrays have a mean and std method) and make a xy marker plot of
522+
NumPy arrays have a mean and std method) and make a xy marker plot of
523523
the 100 means vs. the 100 standard deviations. Connect the line
524524
created by the plot command to the pick event, and plot the original
525525
time series of the data that generated the clicked on points. If more

‎doc/users/prev_whats_new/github_stats_3.0.2.rst

Copy file name to clipboardExpand all lines: doc/users/prev_whats_new/github_stats_3.0.2.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Pull Requests (224):
161161
* :ghpull:`12507`: FIX: make minor ticks formatted with science formatter as well
162162
* :ghpull:`12500`: Adjust the widths of the messages during the build.
163163
* :ghpull:`12492`: Simplify radar_chart example.
164-
* :ghpull:`12478`: MAINT: numpy deprecates asscalar in 1.16
164+
* :ghpull:`12478`: MAINT: NumPy deprecates asscalar in 1.16
165165
* :ghpull:`12363`: FIX: errors in get_position changes
166166
* :ghpull:`12495`: Fix duplicate condition in pathpatch3d example
167167
* :ghpull:`11984`: Strip out pkg-config machinery for agg and libqhull.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.