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 e5098e0

Browse filesBrowse files
oscargusoscargus
authored
Merge pull request #27591 from dstansby/macos
Use macOS instead of OSX in comments/docs
2 parents b4fc72b + 6fd141c commit e5098e0
Copy full SHA for e5098e0

File tree

Expand file treeCollapse file tree

17 files changed

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

17 files changed

+32
-32
lines changed

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
# (sometimes, the install appears to be successful but shared
228228
# libraries cannot be loaded at runtime, so an actual import is a
229229
# better check).
230-
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
230+
# PyGObject, pycairo, and cariocffi do not install on macOS 10.12.
231231
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
232232
(
233233
python -c 'import gi; gi.require_version("Gtk", "4.0"); from gi.repository import Gtk' &&
@@ -237,7 +237,7 @@ jobs:
237237
echo 'PyGObject 3 is available' || echo 'PyGObject 3 is not available'
238238
)
239239
240-
# There are no functioning wheels available for OSX 10.12 (as of
240+
# There are no functioning wheels available for macOS 10.12 (as of
241241
# Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
242242
# pyside2 (the latest version (5.13.2) with 10.12 wheels has a
243243
# fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)

‎doc/users/installing/dependencies.rst

Copy file name to clipboardExpand all lines: doc/users/installing/dependencies.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ tool for locating FreeType:
167167
If not using pkg-config (in particular on Windows), you may need to set the
168168
include path (to the library headers) and link path (to the libraries)
169169
explicitly, if they are not in standard locations. This can be done using
170-
standard environment variables -- on Linux and OSX:
170+
standard environment variables -- on Linux and macOS:
171171

172172
.. code-block:: sh
173173

‎doc/users/installing/environment_variables_faq.rst

Copy file name to clipboardExpand all lines: doc/users/installing/environment_variables_faq.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Environment variables
4949
The Python Qt wrapper to prefer when using Qt-based backends. See :ref:`the
5050
entry in the usage guide <QT_bindings>` for more information.
5151

52-
.. _setting-linux-osx-environment-variables:
52+
.. _setting-linux-macos-environment-variables:
5353

5454
Setting environment variables in Linux and macOS
5555
================================================

‎doc/users/installing/index.rst

Copy file name to clipboardExpand all lines: doc/users/installing/index.rst
+13-13Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,15 @@ installation of the package. In order to fully remove an installed Matplotlib:
203203
2. Delete any Matplotlib directories or eggs from your :ref:`installation
204204
directory <locating-matplotlib-install>`.
205205

206-
OSX Notes
207-
---------
206+
macOS Notes
207+
-----------
208208

209-
.. _which-python-for-osx:
209+
.. _which-python-for-macos:
210210

211-
Which python for OSX?
212-
^^^^^^^^^^^^^^^^^^^^^
211+
Which python for macOS?
212+
^^^^^^^^^^^^^^^^^^^^^^^
213213

214-
Apple ships OSX with its own Python, in ``/usr/bin/python``, and its own copy
214+
Apple ships macOS with its own Python, in ``/usr/bin/python``, and its own copy
215215
of Matplotlib. Unfortunately, the way Apple currently installs its own copies
216216
of NumPy, Scipy and Matplotlib means that these packages are difficult to
217217
upgrade (see `system python packages`_). For that reason we strongly suggest
@@ -228,18 +228,18 @@ See the Anaconda web page for installation support.
228228
.. _Anaconda: https://www.anaconda.com/
229229

230230
Other options for a fresh Python install are the standard installer from
231-
`python.org <https://www.python.org/downloads/mac-osx/>`_, or installing
232-
Python using a general OSX package management system such as `homebrew
231+
`python.org <https://www.python.org/downloads/macos/>`_, or installing
232+
Python using a general macOS package management system such as `homebrew
233233
<https://brew.sh/>`_ or `macports <https://www.macports.org>`_. Power users on
234-
OSX will likely want one of homebrew or macports on their system to install
234+
macOS will likely want one of homebrew or macports on their system to install
235235
open source software packages, but it is perfectly possible to use these
236236
systems with another source for your Python binary, such as Anaconda
237237
or Python.org Python.
238238

239-
.. _install_osx_binaries:
239+
.. _install_macos_binaries:
240240

241-
Installing OSX binary wheels
242-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
241+
Installing macOS binary wheels
242+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
243243

244244
If you are using Python from https://www.python.org, Homebrew, or Macports,
245245
then you can use the standard pip installer to install Matplotlib binaries in
@@ -283,7 +283,7 @@ then check that the Python binary is the one you expected by running ::
283283
which python3
284284

285285
If you get a result like ``/usr/bin/python...``, then you are getting the
286-
Python installed with OSX, which is probably not what you want. Try closing
286+
Python installed with macOS, which is probably not what you want. Try closing
287287
and restarting Terminal.app before running the check again. If that doesn't fix
288288
the problem, depending on which Python you wanted to use, consider reinstalling
289289
Python.org Python, or check your homebrew or macports setup. Remember that

‎doc/users/installing/troubleshooting_faq.inc.rst

Copy file name to clipboardExpand all lines: doc/users/installing/troubleshooting_faq.inc.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ directory by default::
6767
If you would like to use a different configuration directory, you can
6868
do so by specifying the location in your :envvar:`MPLCONFIGDIR`
6969
environment variable -- see
70-
:ref:`setting-linux-osx-environment-variables`. Note that
70+
:ref:`setting-linux-macos-environment-variables`. Note that
7171
:envvar:`MPLCONFIGDIR` sets the location of both the configuration
7272
directory and the cache directory.

‎galleries/examples/shapes_and_collections/hatch_demo.py

Copy file name to clipboardExpand all lines: galleries/examples/shapes_and_collections/hatch_demo.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
Hatches can be added to most polygons in Matplotlib, including `~.Axes.bar`,
77
`~.Axes.fill_between`, `~.Axes.contourf`, and children of `~.patches.Polygon`.
8-
They are currently supported in the PS, PDF, SVG, OSX, and Agg backends. The WX
8+
They are currently supported in the PS, PDF, SVG, macosx, and Agg backends. The WX
99
and Cairo backends do not currently support hatching.
1010
1111
See also :doc:`/gallery/images_contours_and_fields/contourf_hatching` for

‎galleries/examples/shapes_and_collections/hatch_style_reference.py

Copy file name to clipboardExpand all lines: galleries/examples/shapes_and_collections/hatch_style_reference.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
Hatches can be added to most polygons in Matplotlib, including `~.Axes.bar`,
77
`~.Axes.fill_between`, `~.Axes.contourf`, and children of `~.patches.Polygon`.
8-
They are currently supported in the PS, PDF, SVG, OSX, and Agg backends. The WX
8+
They are currently supported in the PS, PDF, SVG, macosx, and Agg backends. The WX
99
and Cairo backends do not currently support hatching.
1010
1111
See also :doc:`/gallery/images_contours_and_fields/contourf_hatching` for

‎galleries/examples/user_interfaces/svg_histogram_sgskip.py

Copy file name to clipboardExpand all lines: galleries/examples/user_interfaces/svg_histogram_sgskip.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
The interactivity is encoded in ecmascript (javascript) and inserted in
1010
the SVG code in a post-processing step. To render the image, open it in
1111
a web browser. SVG is supported in most web browsers used by Linux and
12-
OSX users. Windows IE9 supports SVG, but earlier versions do not.
12+
macOS users. Windows IE9 supports SVG, but earlier versions do not.
1313
1414
Notes
1515
-----

‎galleries/users_explain/animations/blitting.py

Copy file name to clipboardExpand all lines: galleries/users_explain/animations/blitting.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
4545
.. warning::
4646
47-
This code does not work with the OSX backend (but does work with other
47+
This code does not work with the macosx backend (but does work with other
4848
GUI backends on Mac).
4949
5050
Minimal example

‎galleries/users_explain/figure/backends.rst

Copy file name to clipboardExpand all lines: galleries/users_explain/figure/backends.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ GTK3Agg Agg rendering to a GTK_ 3.x canvas (requires PyGObject_ and
182182
GTK4Agg Agg rendering to a GTK_ 4.x canvas (requires PyGObject_ and
183183
pycairo_). This backend can be activated in IPython with
184184
``%matplotlib gtk4``.
185-
macosx Agg rendering into a Cocoa canvas in OSX. This backend can be
185+
macosx Agg rendering into a Cocoa canvas in macOS. This backend can be
186186
activated in IPython with ``%matplotlib osx``.
187187
TkAgg Agg rendering to a Tk_ canvas (requires TkInter_). This
188188
backend can be activated in IPython with ``%matplotlib tk``.

‎galleries/users_explain/figure/event_handling.rst

Copy file name to clipboardExpand all lines: galleries/users_explain/figure/event_handling.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Event handling and picking
88
**************************
99

1010
Matplotlib works with a number of user interface toolkits (wxpython,
11-
tkinter, qt, gtk, and macosx) and in order to support features like
11+
tkinter, qt, gtk, and macOS) and in order to support features like
1212
interactive panning and zooming of figures, it is helpful to the
1313
developers to have an API for interacting with the figure via key
1414
presses and mouse movements that is "GUI neutral" so we don't have to

‎galleries/users_explain/figure/interactive_guide.rst

Copy file name to clipboardExpand all lines: galleries/users_explain/figure/interactive_guide.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ depending on the library, by methods with names like ``_exec``,
5858
``run``, or ``start``.
5959

6060

61-
All GUI frameworks (Qt, Wx, Gtk, tk, OSX, or web) have some method of
61+
All GUI frameworks (Qt, Wx, Gtk, tk, macOS, or web) have some method of
6262
capturing user interactions and passing them back to the application
6363
(for example ``Signal`` / ``Slot`` framework in Qt) but the exact
6464
details depend on the toolkit. Matplotlib has a :ref:`backend

‎lib/matplotlib/animation.py

Copy file name to clipboardExpand all lines: lib/matplotlib/animation.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ def output_args(self):
541541
else mpl.rcParams[self._args_key])
542542
# For h264, the default format is yuv444p, which is not compatible
543543
# with quicktime (and others). Specifying yuv420p fixes playback on
544-
# iOS, as well as HTML5 video in firefox and safari (on both Win and
545-
# OSX). Also fixes internet explorer. This is as of 2015/10/29.
544+
# iOS, as well as HTML5 video in firefox and safari (on both Windows and
545+
# macOS). Also fixes internet explorer. This is as of 2015/10/29.
546546
if self.codec == 'h264' and '-pix_fmt' not in extra_args:
547547
args.extend(['-pix_fmt', 'yuv420p'])
548548
# For GIF, we're telling FFMPEG to split the video stream, to generate

‎lib/matplotlib/backends/backend_qt.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_qt.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
("Key_PageUp", "pageup"),
4141
("Key_PageDown", "pagedown"),
4242
("Key_Shift", "shift"),
43-
# In OSX, the control and super (aka cmd/apple) keys are switched.
43+
# In macOS, the control and super (aka cmd/apple) keys are switched.
4444
("Key_Control", "control" if sys.platform != "darwin" else "cmd"),
4545
("Key_Meta", "meta" if sys.platform != "darwin" else "control"),
4646
("Key_Alt", "alt"),

‎lib/matplotlib/tests/test_backends_interactive.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backends_interactive.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def _get_available_interactive_backends():
9090
if reason:
9191
marks.append(pytest.mark.skip(reason=f"Skipping {env} because {reason}"))
9292
elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':
93-
# ignore on OSX because that's currently broken (github #16849)
93+
# ignore on macosx because that's currently broken (github #16849)
9494
marks.append(pytest.mark.xfail(reason='github #16849'))
9595
elif (env['MPLBACKEND'] == 'tkagg' and
9696
('TF_BUILD' in os.environ or 'GITHUB_ACTION' in os.environ) and

‎meson_options.txt

Copy file name to clipboardExpand all lines: meson_options.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ option('system-qhull', type: 'boolean', value: false,
1111
description: 'Build against system version of Qhull')
1212

1313
# Some of Matplotlib's components are optional: the MacOSX backend (installed
14-
# by default on MacOSX; requires the Cocoa headers included with XCode). You
14+
# by default on macOS; requires the Cocoa headers included with XCode). You
1515
# can control whether they are installed using the following options. Note that
1616
# the MacOSX backend is never built on Linux or Windows, regardless of the
1717
# config value.

‎src/_macosx.m

Copy file name to clipboardExpand all lines: src/_macosx.m
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ int mpl_check_modifier(
409409
[[NSCursor openHandCursor] set];
410410
}
411411
break;
412-
/* OSX handles busy state itself so no need to set a cursor here */
412+
/* macOS handles busy state itself so no need to set a cursor here */
413413
case 5: break;
414414
case 6: [[NSCursor resizeLeftRightCursor] set]; break;
415415
case 7: [[NSCursor resizeUpDownCursor] set]; break;
@@ -1792,7 +1792,7 @@ - (void)flagsChanged:(NSEvent *)event
17921792
{"event_loop_is_running",
17931793
(PyCFunction)event_loop_is_running,
17941794
METH_NOARGS,
1795-
"Return whether the OSX backend has set up the NSApp main event loop."},
1795+
"Return whether the macosx backend has set up the NSApp main event loop."},
17961796
{"wake_on_fd_write",
17971797
(PyCFunction)wake_on_fd_write,
17981798
METH_VARARGS,

0 commit comments

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