Merge pull request matplotlib#27591 from dstansby/macos

oscargus · web-flow · commit e5098e0dc2e5 · 2024-01-02T10:16:32.000+01:00
Use macOS instead of OSX in comments/docs
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -227,7 +227,7 @@ jobs:
           # (sometimes, the install appears to be successful but shared
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
-          # PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
+          # PyGObject, pycairo, and cariocffi do not install on macOS 10.12.
           python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
             (
               python -c 'import gi; gi.require_version("Gtk", "4.0"); from gi.repository import Gtk' &&
@@ -237,7 +237,7 @@ jobs:
               echo 'PyGObject 3 is available' || echo 'PyGObject 3 is not available'
             )
 
-          # There are no functioning wheels available for OSX 10.12 (as of
+          # There are no functioning wheels available for macOS 10.12 (as of
           # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
           # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
           # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
diff --git a/doc/users/installing/dependencies.rst b/doc/users/installing/dependencies.rst
@@ -167,7 +167,7 @@ tool for locating FreeType:
 If not using pkg-config (in particular on Windows), you may need to set the
 include path (to the library headers) and link path (to the libraries)
 explicitly, if they are not in standard locations.  This can be done using
-standard environment variables -- on Linux and OSX:
+standard environment variables -- on Linux and macOS:
 
 .. code-block:: sh
 
diff --git a/doc/users/installing/environment_variables_faq.rst b/doc/users/installing/environment_variables_faq.rst
@@ -49,7 +49,7 @@ Environment variables
    The Python Qt wrapper to prefer when using Qt-based backends. See :ref:`the
    entry in the usage guide <QT_bindings>` for more information.
 
-.. _setting-linux-osx-environment-variables:
+.. _setting-linux-macos-environment-variables:
 
 Setting environment variables in Linux and macOS
 ================================================
diff --git a/doc/users/installing/index.rst b/doc/users/installing/index.rst
@@ -203,15 +203,15 @@ installation of the package.  In order to fully remove an installed Matplotlib:
 2. Delete any Matplotlib directories or eggs from your :ref:`installation
    directory <locating-matplotlib-install>`.
 
-OSX Notes
----------
+macOS Notes
+-----------
 
-.. _which-python-for-osx:
+.. _which-python-for-macos:
 
-Which python for OSX?
-^^^^^^^^^^^^^^^^^^^^^
+Which python for macOS?
+^^^^^^^^^^^^^^^^^^^^^^^
 
-Apple ships OSX with its own Python, in ``/usr/bin/python``, and its own copy
+Apple ships macOS with its own Python, in ``/usr/bin/python``, and its own copy
 of Matplotlib. Unfortunately, the way Apple currently installs its own copies
 of NumPy, Scipy and Matplotlib means that these packages are difficult to
 upgrade (see `system python packages`_).  For that reason we strongly suggest
@@ -228,18 +228,18 @@ See the Anaconda web page for installation support.
 .. _Anaconda: https://www.anaconda.com/
 
 Other options for a fresh Python install are the standard installer from
-`python.org <https://www.python.org/downloads/mac-osx/>`_, or installing
-Python using a general OSX package management system such as `homebrew
+`python.org <https://www.python.org/downloads/macos/>`_, or installing
+Python using a general macOS package management system such as `homebrew
 <https://brew.sh/>`_ or `macports <https://www.macports.org>`_.  Power users on
-OSX will likely want one of homebrew or macports on their system to install
+macOS will likely want one of homebrew or macports on their system to install
 open source software packages, but it is perfectly possible to use these
 systems with another source for your Python binary, such as Anaconda
 or Python.org Python.
 
-.. _install_osx_binaries:
+.. _install_macos_binaries:
 
-Installing OSX binary wheels
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Installing macOS binary wheels
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you are using Python from https://www.python.org, Homebrew, or Macports,
 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 ::
   which python3
 
 If you get a result like ``/usr/bin/python...``, then you are getting the
-Python installed with OSX, which is probably not what you want.  Try closing
+Python installed with macOS, which is probably not what you want.  Try closing
 and restarting Terminal.app before running the check again. If that doesn't fix
 the problem, depending on which Python you wanted to use, consider reinstalling
 Python.org Python, or check your homebrew or macports setup.  Remember that
diff --git a/doc/users/installing/troubleshooting_faq.inc.rst b/doc/users/installing/troubleshooting_faq.inc.rst
@@ -67,6 +67,6 @@ directory by default::
 If you would like to use a different configuration directory, you can
 do so by specifying the location in your :envvar:`MPLCONFIGDIR`
 environment variable -- see
-:ref:`setting-linux-osx-environment-variables`.  Note that
+:ref:`setting-linux-macos-environment-variables`.  Note that
 :envvar:`MPLCONFIGDIR` sets the location of both the configuration
 directory and the cache directory.
diff --git a/galleries/examples/shapes_and_collections/hatch_demo.py b/galleries/examples/shapes_and_collections/hatch_demo.py
@@ -5,7 +5,7 @@
 
 Hatches can be added to most polygons in Matplotlib, including `~.Axes.bar`,
 `~.Axes.fill_between`, `~.Axes.contourf`, and children of `~.patches.Polygon`.
-They are currently supported in the PS, PDF, SVG, OSX, and Agg backends. The WX
+They are currently supported in the PS, PDF, SVG, macosx, and Agg backends. The WX
 and Cairo backends do not currently support hatching.
 
 See also :doc:`/gallery/images_contours_and_fields/contourf_hatching` for
diff --git a/galleries/examples/shapes_and_collections/hatch_style_reference.py b/galleries/examples/shapes_and_collections/hatch_style_reference.py
@@ -5,7 +5,7 @@
 
 Hatches can be added to most polygons in Matplotlib, including `~.Axes.bar`,
 `~.Axes.fill_between`, `~.Axes.contourf`, and children of `~.patches.Polygon`.
-They are currently supported in the PS, PDF, SVG, OSX, and Agg backends. The WX
+They are currently supported in the PS, PDF, SVG, macosx, and Agg backends. The WX
 and Cairo backends do not currently support hatching.
 
 See also :doc:`/gallery/images_contours_and_fields/contourf_hatching` for
diff --git a/galleries/examples/user_interfaces/svg_histogram_sgskip.py b/galleries/examples/user_interfaces/svg_histogram_sgskip.py
@@ -9,7 +9,7 @@
 The interactivity is encoded in ecmascript (javascript) and inserted in
 the SVG code in a post-processing step. To render the image, open it in
 a web browser. SVG is supported in most web browsers used by Linux and
-OSX users. Windows IE9 supports SVG, but earlier versions do not.
+macOS users. Windows IE9 supports SVG, but earlier versions do not.
 
 Notes
 -----
diff --git a/galleries/users_explain/animations/blitting.py b/galleries/users_explain/animations/blitting.py
@@ -44,7 +44,7 @@
 
 .. warning::
 
-   This code does not work with the OSX backend (but does work with other
+   This code does not work with the macosx backend (but does work with other
    GUI backends on Mac).
 
 Minimal example
diff --git a/galleries/users_explain/figure/backends.rst b/galleries/users_explain/figure/backends.rst
@@ -182,7 +182,7 @@ GTK3Agg   Agg rendering to a GTK_ 3.x canvas (requires PyGObject_ and
 GTK4Agg   Agg rendering to a GTK_ 4.x canvas (requires PyGObject_ and
           pycairo_).  This backend can be activated in IPython with
           ``%matplotlib gtk4``.
-macosx    Agg rendering into a Cocoa canvas in OSX.  This backend can be
+macosx    Agg rendering into a Cocoa canvas in macOS.  This backend can be
           activated in IPython with ``%matplotlib osx``.
 TkAgg     Agg rendering to a Tk_ canvas (requires TkInter_). This
           backend can be activated in IPython with ``%matplotlib tk``.
diff --git a/galleries/users_explain/figure/event_handling.rst b/galleries/users_explain/figure/event_handling.rst
@@ -8,7 +8,7 @@ Event handling and picking
 **************************
 
 Matplotlib works with a number of user interface toolkits (wxpython,
-tkinter, qt, gtk, and macosx) and in order to support features like
+tkinter, qt, gtk, and macOS) and in order to support features like
 interactive panning and zooming of figures, it is helpful to the
 developers to have an API for interacting with the figure via key
 presses and mouse movements that is "GUI neutral" so we don't have to
diff --git a/galleries/users_explain/figure/interactive_guide.rst b/galleries/users_explain/figure/interactive_guide.rst
@@ -58,7 +58,7 @@ depending on the library, by methods with names like ``_exec``,
 ``run``, or ``start``.
 
 
-All GUI frameworks (Qt, Wx, Gtk, tk, OSX, or web) have some method of
+All GUI frameworks (Qt, Wx, Gtk, tk, macOS, or web) have some method of
 capturing user interactions and passing them back to the application
 (for example ``Signal`` / ``Slot`` framework in Qt) but the exact
 details depend on the toolkit.  Matplotlib has a :ref:`backend
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -541,8 +541,8 @@ def output_args(self):
                       else mpl.rcParams[self._args_key])
         # For h264, the default format is yuv444p, which is not compatible
         # with quicktime (and others). Specifying yuv420p fixes playback on
-        # iOS, as well as HTML5 video in firefox and safari (on both Win and
-        # OSX). Also fixes internet explorer. This is as of 2015/10/29.
+        # iOS, as well as HTML5 video in firefox and safari (on both Windows and
+        # macOS). Also fixes internet explorer. This is as of 2015/10/29.
         if self.codec == 'h264' and '-pix_fmt' not in extra_args:
             args.extend(['-pix_fmt', 'yuv420p'])
         # For GIF, we're telling FFMPEG to split the video stream, to generate
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -40,7 +40,7 @@
         ("Key_PageUp", "pageup"),
         ("Key_PageDown", "pagedown"),
         ("Key_Shift", "shift"),
-        # In OSX, the control and super (aka cmd/apple) keys are switched.
+        # In macOS, the control and super (aka cmd/apple) keys are switched.
         ("Key_Control", "control" if sys.platform != "darwin" else "cmd"),
         ("Key_Meta", "meta" if sys.platform != "darwin" else "control"),
         ("Key_Alt", "alt"),
diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -90,7 +90,7 @@ def _get_available_interactive_backends():
         if reason:
             marks.append(pytest.mark.skip(reason=f"Skipping {env} because {reason}"))
         elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':
-            # ignore on OSX because that's currently broken (github #16849)
+            # ignore on macosx because that's currently broken (github #16849)
             marks.append(pytest.mark.xfail(reason='github #16849'))
         elif (env['MPLBACKEND'] == 'tkagg' and
               ('TF_BUILD' in os.environ or 'GITHUB_ACTION' in os.environ) and
diff --git a/meson_options.txt b/meson_options.txt
@@ -11,7 +11,7 @@ option('system-qhull', type: 'boolean', value: false,
        description: 'Build against system version of Qhull')
 
 # Some of Matplotlib's components are optional: the MacOSX backend (installed
-# by default on MacOSX; requires the Cocoa headers included with XCode). You
+# by default on macOS; requires the Cocoa headers included with XCode). You
 # can control whether they are installed using the following options. Note that
 # the MacOSX backend is never built on Linux or Windows, regardless of the
 # config value.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -409,7 +409,7 @@ int mpl_check_modifier(
             [[NSCursor openHandCursor] set];
         }
         break;
-      /* OSX handles busy state itself so no need to set a cursor here */
+      /* macOS handles busy state itself so no need to set a cursor here */
       case 5: break;
       case 6: [[NSCursor resizeLeftRightCursor] set]; break;
       case 7: [[NSCursor resizeUpDownCursor] set]; break;
@@ -1792,7 +1792,7 @@ - (void)flagsChanged:(NSEvent *)event
         {"event_loop_is_running",
          (PyCFunction)event_loop_is_running,
          METH_NOARGS,
-         "Return whether the OSX backend has set up the NSApp main event loop."},
+         "Return whether the macosx backend has set up the NSApp main event loop."},
         {"wake_on_fd_write",
          (PyCFunction)wake_on_fd_write,
          METH_VARARGS,
