Merge pull request pypa#345 from fmaida/master

Changing the reference from "OS X" to "macOS"

Author: ddbeck

scripts/linkmonitor/inventory.yaml

@@ -64,6 +64,7 @@
   guides/index.html#guides, guides/installing-scientific-packages.html, guides/installing-scientific-packages.html#building-from-source,
   guides/installing-scientific-packages.html#contents, guides/installing-scientific-packages.html#installing-scientific-packages,
   guides/installing-scientific-packages.html#linux-distribution-packages, guides/installing-scientific-packages.html#mac-os-x-installers-and-package-managers,
+  guides/installing-scientific-packages.html#macos-installers-and-package-managers,
   guides/installing-scientific-packages.html#numpy-and-the-science-stack, guides/installing-scientific-packages.html#scipy-distributions,
   guides/installing-scientific-packages.html#spack, guides/installing-scientific-packages.html#the-conda-cross-platform-package-manager,
   guides/installing-scientific-packages.html#windows-installers, guides/installing-using-linux-tools.html,

source/discussions/deploying-python-applications.rst

@@ -45,7 +45,7 @@ OS Packaging & Installers
 
   - Building rpm/debs for projects
   - Building rpms/debs for whole virtualenvs
-  - Building Mac OS X installers for Python projects
+  - Building macOS installers for Python projects
   - Building Android APKs with Kivy+P4A or P4A & Buildozer
 
 Windows

source/guides/installing-scientific-packages.rst

@@ -89,14 +89,17 @@ limitation.
 The `wheel` project also provides a `wheel convert` subcommand that can
 convert a Windows `bdist_wininst` installer to a wheel.
 
-Mac OS X installers and package managers
-----------------------------------------
+.. preserve old links to this heading
+.. _mac-os-x-installers-and-package-managers:
+
+macOS installers and package managers
+-------------------------------------
 
 Similar to the situation on Windows, many projects (including NumPy) publish
-Mac OS X installers that are compatible with the Mac OS X CPython binaries
+macOS installers that are compatible with the macOS CPython binaries
 published on python.org.
 
-Mac OS X users also have access to Linux distribution style package managers
+macOS users also have access to Linux distribution style package managers
 such as ``MacPorts``. The SciPy site has more details on using MacPorts to
 install the `scientific Python stack
 <http://www.scipy.org/install.html#mac-packages>`__
@@ -144,7 +147,7 @@ updated from the Anaconda repository.
 environment management system included in Anaconda that allows users to 
 install multiple versions of binary software packages and their dependencies, 
 and easily switch between them. It is a cross-platform tool working on Windows, 
-OSX, and Linux. Conda can be used to package up and distribute all kinds of 
+macOS, and Linux. Conda can be used to package up and distribute all kinds of
 packages, it is not limited to just Python packages.   It has full support 
 for native virtual environments. Conda makes environments first-class citizens, 
 making it easy to create independent environments even for C libraries. It is 

source/guides/packaging-binary-extensions.rst

@@ -275,7 +275,7 @@ be able to build Python extensions for all Python versions from 3.5 onwards.
    FIXME
 
    cover Windows binary compatibility requirements
-   cover Mac OS X binary compatibility requirements
+   cover macOS binary compatibility requirements
    cover the vagaries of Linux distros and other *nix systems
 
 
@@ -291,7 +291,7 @@ For interim guidance on this topic, see the discussion in
    FIXME
 
    cover publishing as wheel files on PyPI or a custom index server
-   cover creation of Windows and Mac OS X installers
+   cover creation of Windows and macOS installers
    mention the fact that Linux distros have a requirement to build from
    source in their own build systems, so binary-only releases are strongly
    discouraged

source/guides/supporting-multiple-python-versions.rst

@@ -63,9 +63,9 @@ of many continuous-integration systems. There are two hosted services which
 when used in conjunction provide automated testing across Linux, Mac and
 Windows:
 
-  - `Travis CI <https://travis-ci.org>`_ provides both a Linux and a Mac OSX
+  - `Travis CI <https://travis-ci.org>`_ provides both a Linux and a macOS
     environment. The Linux environment is Ubuntu 12.04 LTS Server Edition 64 bit
-    while the OSX is 10.9.2 at the time of writing.
+    while the macOS is 10.9.2 at the time of writing.
   - `Appveyor <http://www.appveyor.com>`_ provides a Windows environment
     (Windows Server 2012).
 
@@ -74,7 +74,7 @@ Windows:
     TODO Either link to or provide example .yml files for these two
     services.
 
-    TODO How do we keep the Travis Linux and OSX versions up-to-date in this
+    TODO How do we keep the Travis Linux and macOS versions up-to-date in this
     document?
 
 Both `Travis CI`_ and Appveyor_ require a `YAML

source/guides/tool-recommendations.rst

@@ -158,7 +158,7 @@ milestone.
        choice for packaging.
 
 .. [7] :term:`PyPI <Python Package Index (PyPI)>` currently only allows
-       uploading Windows and Mac OS X wheels, and they should be compatible with
+       uploading Windows and macOS wheels, and they should be compatible with
        the binary installers provided for download from python.org. Enhancements
        will have to be made to the :pep:`wheel compatibility tagging scheme
        <425>` before linux wheels will be allowed.

source/tutorials/distributing-packages.rst

@@ -768,7 +768,7 @@ Platform Wheels
 ~~~~~~~~~~~~~~~
 
 *Platform Wheels* are wheels that are specific to a certain platform like linux,
-OSX, or Windows, usually due to containing compiled extensions.
+macOS, or Windows, usually due to containing compiled extensions.
 
 To build the wheel:
 
@@ -784,7 +784,7 @@ on. For details on the naming of wheel files, see :pep:`425`
 .. note::
 
   :term:`PyPI <Python Package Index (PyPI)>` currently supports uploads of
-  platform wheels for Windows, OS X, and the multi-distro ``manylinux1`` ABI.
+  platform wheels for Windows, macOS, and the multi-distro ``manylinux1`` ABI.
   Details of the latter are defined in :pep:`513`.
 
 

source/tutorials/installing-packages.rst

@@ -34,7 +34,7 @@ Install pip, setuptools, and wheel
   <https://www.python.org>`_, you will already have :ref:`pip` and
   :ref:`setuptools`, but will need to upgrade to the latest version:
 
-  On Linux or OS X:
+  On Linux or macOS:
 
   ::