OS X -> macOS (#4074)

CHANGES.txt

@@ -167,7 +167,7 @@
   specific interpreter (:issue:`3472`).
 
 * Fix an issue where pip would erroneously install a 64 bit wheel on a 32 bit
-  Python running on a 64 bit OS X machine.
+  Python running on a 64 bit macOS machine.
 
 * Do not assume that all git repositories have an origin remote.
 
@@ -1059,7 +1059,7 @@
 
 * Improvements to sphinx docs and cli help. (:pull:`773`)
 
-* Fixed :issue:`707`, dealing with OS X temp dir handling, which was causing
+* Fixed :issue:`707`, dealing with macOS temp dir handling, which was causing
   global NumPy installs to fail. (:pull:`768`)
 
 * Split help output into general vs command-specific option groups.
@@ -1204,10 +1204,10 @@
   get the benefits of pip's support you must use Distribute rather than
   setuptools.
 
-* Fixed :issue:`57` - ignore py2app-generated OS X mpkg zip files in finder.
+* Fixed :issue:`57` - ignore py2app-generated macOS mpkg zip files in finder.
   Thanks Rene Dudfield.
 
-* Fixed :issue:`182` - log to ~/Library/Logs/ by default on OS X framework
+* Fixed :issue:`182` - log to ~/Library/Logs/ by default on macOS framework
   installs. Thanks Dan Callahan for report and patch.
 
 * Fixed :issue:`310` - understand version tags without minor version ("py3")
@@ -1330,7 +1330,7 @@
 
     pip install git+https://github.com/pypa/pip/
 
-* Fixed :issue:`175` - Correctly locate build and source directory on Mac OS X.
+* Fixed :issue:`175` - Correctly locate build and source directory on macOS.
 
 * Added ``git+https://`` scheme to Git VCS backend.
 
@@ -1415,7 +1415,7 @@
   a non-writable symlink to the global location).
 * pip now logs to a central location by default (instead of creating
   ``pip-log.txt`` all over the place) and constantly overwrites the
-  file in question. On Unix and Mac OS X this is ``'$HOME/.pip/pip.log'``
+  file in question. On Unix and macOS this is ``'$HOME/.pip/pip.log'``
   and on Windows it's ``'%HOME%\\pip\\pip.log'``. You are still able to
   override this location with the ``$PIP_LOG_FILE`` environment variable.
   For a complete (appended) logfile use the separate ``'--log'`` command line
@@ -1499,7 +1499,7 @@
 
 * Fixed uninstallation of easy_installed console_scripts.
 
-* Fixed uninstallation on Mac OS X Framework layout installs
+* Fixed uninstallation on macOS Framework layout installs
 
 * Fixed bug preventing uninstall of editables with source outside venv.
 

docs/installing.rst

@@ -91,7 +91,7 @@ the `Python Packaging User Guide
 Upgrading pip
 -------------
 
-On Linux or OS X:
+On Linux or macOS:
 
 ::
 
@@ -114,7 +114,7 @@ This means pip works on the latest patch version of each of these minor versions
 (i.e. 2.6.9 for 2.6, etc).
 Previous patch versions are supported on a best effort approach.
 
-pip works on Unix/Linux, OS X, and Windows.
+pip works on Unix/Linux, macOS, and Windows.
 
 
 ----

docs/reference/pip_install.rst

@@ -487,7 +487,7 @@ The default location for the cache directory depends on the Operating System:
 
 Unix
   :file:`~/.cache/pip` and it respects the ``XDG_CACHE_HOME`` directory.
-OS X
+macOS
   :file:`~/Library/Caches/pip`.
 Windows
   :file:`<CSIDL_LOCAL_APPDATA>\\pip\\Cache`

docs/user_guide.rst

@@ -279,14 +279,14 @@ all users) configuration:
 
 * On Unix the default configuration file is: :file:`$HOME/.config/pip/pip.conf`
   which respects the ``XDG_CONFIG_HOME`` environment variable.
-* On Mac OS X the configuration file is
+* On macOS the configuration file is
   :file:`$HOME/Library/Application Support/pip/pip.conf`.
 * On Windows the configuration file is :file:`%APPDATA%\\pip\\pip.ini`.
 
 There are also a legacy per-user configuration file which is also respected,
 these are located at:
 
-* On Unix and Mac OS X the configuration file is: :file:`$HOME/.pip/pip.conf`
+* On Unix and macOS the configuration file is: :file:`$HOME/.pip/pip.conf`
 * On Windows the configuration file is: :file:`%HOME%\\pip\\pip.ini`
 
 You can set a custom path location for this config file using the environment
@@ -294,7 +294,7 @@ variable ``PIP_CONFIG_FILE``.
 
 **Inside a virtualenv**:
 
-* On Unix and Mac OS X the file is :file:`$VIRTUAL_ENV/pip.conf`
+* On Unix and macOS the file is :file:`$VIRTUAL_ENV/pip.conf`
 * On Windows the file is: :file:`%VIRTUAL_ENV%\\pip.ini`
 
 **Site-wide**:
@@ -303,7 +303,7 @@ variable ``PIP_CONFIG_FILE``.
   it may be in a "pip" subdirectory of any of the paths set in the
   environment variable ``XDG_CONFIG_DIRS`` (if it exists), for example
   :file:`/etc/xdg/pip/pip.conf`.
-* On Mac OS X the file is: :file:`/Library/Application Support/pip/pip.conf`
+* On macOS the file is: :file:`/Library/Application Support/pip/pip.conf`
 * On Windows XP the file is:
   :file:`C:\\Documents and Settings\\All Users\\Application Data\\pip\\pip.ini`
 * On Windows 7 and later the file is hidden, but writeable at

pip/_vendor/appdirs.py

@@ -10,7 +10,7 @@ See <http://github.com/ActiveState/appdirs> for details and usage.
 # Dev Notes:
 # - MSDN on where to store app data files:
 #   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
+# - macOS: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
 # - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
 __version_info__ = (1, 4, 0)
@@ -30,7 +30,7 @@ if sys.platform.startswith('java'):
     os_name = platform.java_ver()[3][0]
     if os_name.startswith('Windows'): # "Windows XP", "Windows 7", etc.
         system = 'win32'
-    elif os_name.startswith('Mac'): # "Mac OS X", etc.
+    elif os_name.startswith('Mac'): # "macOS", etc.
         system = 'darwin'
     else: # "Linux", "SunOS", "FreeBSD", etc.
         # Setting this to "linux2" is not ideal, but only Windows or Mac
@@ -64,7 +64,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
+        macOS:                  ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
         Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
@@ -118,7 +118,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             if XDG_DATA_DIRS is not set
 
     Typical user data directories are:
-        Mac OS X:   /Library/Application Support/<AppName>
+        macOS:      /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
         Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
@@ -185,7 +185,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               same as user_data_dir
+        macOS:                  same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
@@ -223,7 +223,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
     Typical user data directories are:
-        Mac OS X:   same as site_data_dir
+        macOS:      same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
         Win *:      same as site_data_dir
@@ -273,7 +273,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
             discussion below.
 
     Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
+        macOS:      ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
@@ -330,7 +330,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             base cache dir for Unix. See discussion below.
 
     Typical user cache directories are:
-        Mac OS X:   ~/Library/Logs/<AppName>
+        macOS:      ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs

pip/_vendor/distlib/_backport/sysconfig.py

@@ -528,7 +528,7 @@ def get_config_vars(*args):
             major_version = int(kernel_version.split('.')[0])
 
             if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
+                # On macOS before 10.4, check if -arch and -isysroot
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.

pip/_vendor/distlib/util.py

@@ -161,7 +161,7 @@ def in_venv():
 def get_executable():
 # The __PYVENV_LAUNCHER__ dance is apparently no longer needed, as
 # changes to the stub launcher mean that sys.executable always points
-# to the stub on OS X
+# to the stub on macOS
 #    if sys.platform == 'darwin' and ('__PYVENV_LAUNCHER__'
 #                                     in os.environ):
 #        result =  os.environ['__PYVENV_LAUNCHER__']

pip/_vendor/pkg_resources/__init__.py

@@ -255,10 +255,10 @@ def get_supported_platform():
     """Return this platform's maximum compatible version.
 
     distutils.util.get_platform() normally reports the minimum version
-    of Mac OS X that would be required to *use* extensions produced by
+    of macOS that would be required to *use* extensions produced by
     distutils.  But what we want when checking compatibility is to know the
-    version of Mac OS X that we are *running*.  To allow usage of packages that
+    version of macOS that we are *running*.  To allow usage of packages that
-    explicitly require a newer version of Mac OS X, we must also know the
+    explicitly require a newer version of macOS, we must also know the
     current version of the OS.
 
     If this condition occurs for any other platform with a version in its
@@ -270,7 +270,7 @@ def get_supported_platform():
         try:
             plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
         except ValueError:
-            # not Mac OS X
+            # not macOS
             pass
     return plat
 
@@ -462,7 +462,7 @@ def get_build_platform():
     """Return this platform's string for platform-specific distributions
 
     XXX Currently this is the same as ``distutils.util.get_platform()``, but it
-    needs some hacks for Linux and Mac OS X.
+    needs some hacks for Linux and macOS.
     """
     try:
         # Python 2.7 or >=3.2
@@ -501,7 +501,7 @@ def compatible_platforms(provided, required):
         # easy case
         return True
 
-    # Mac OS X special cases
+    # macOS special cases
     reqMac = macosVersionString.match(required)
     if reqMac:
         provMac = macosVersionString.match(provided)

pip/_vendor/requests/utils.py

@@ -581,7 +581,7 @@ def should_bypass_proxies(url):
 
     # If the system proxy settings indicate that this URL should be bypassed,
     # don't proxy.
-    # The proxy_bypass function is incredibly buggy on OS X in early versions
+    # The proxy_bypass function is incredibly buggy on macOS in early versions
     # of Python 2.6, so allow this call to fail. Only catch the specific
     # exceptions we've seen, though: this call failing in other ways can reveal
     # legitimate problems.

pip/download.py

@@ -105,7 +105,7 @@ def user_agent():
             data["distro"] = distro_infos
 
     if sys.platform.startswith("darwin") and platform.mac_ver()[0]:
-        data["distro"] = {"name": "OS X", "version": platform.mac_ver()[0]}
+        data["distro"] = {"name": "macOS", "version": platform.mac_ver()[0]}
 
     if platform.system():
         data.setdefault("system", {})["name"] = platform.system()

pip/locations.py

@@ -73,7 +73,7 @@ else:
             "The folder you are executing pip from can no longer be found."
         )
 
-# under Mac OS X + virtualenv sys.prefix is not properly resolved
+# under macOS + virtualenv sys.prefix is not properly resolved
 # it is something like /path/to/python/bin/..
 # Note: using realpath due to tmp dirs on OSX being symlinks
 src_prefix = os.path.abspath(src_prefix)
@@ -110,7 +110,7 @@ else:
         config_basename,
     )
 
-    # Forcing to use /usr/local/bin for standard Mac OS X framework installs
+    # Forcing to use /usr/local/bin for standard macOS framework installs
     # Also log to ~/Library/Logs/ for use with the Console.app log viewer
     if sys.platform[:6] == 'darwin' and sys.prefix[:16] == '/System/Library/':
         bin_py = '/usr/local/bin'

pip/pep425tags.py

@@ -164,12 +164,12 @@ def is_manylinux1_compatible():
 
 def get_darwin_arches(major, minor, machine):
     """Return a list of supported arches (including group arches) for
-    the given major, minor and machine architecture of an OS X machine.
+    the given major, minor and machine architecture of an macOS machine.
     """
     arches = []
 
     def _supports_arch(major, minor, arch):
-        # Looking at the application support for OS X versions in the chart
+        # Looking at the application support for macOS versions in the chart
         # provided by https://en.wikipedia.org/wiki/OS_X#Versions it appears
         # our timeline looks roughly like:
         #

pip/utils/appdirs.py

@@ -18,9 +18,9 @@ def user_cache_dir(appname):
         "appname" is the name of application.
 
     Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
+        macOS:      ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
-        Windows:      C:\Users\<username>\AppData\Local\<AppName>\Cache
+        Windows:    C:\Users\<username>\AppData\Local\<AppName>\Cache
 
     On Windows the only suggestion in the MSDN docs is that local settings go
     in the `CSIDL_LOCAL_APPDATA` directory. This is identical to the
@@ -73,7 +73,7 @@ def user_data_dir(appname, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
+        macOS:                  ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in
                                 $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\ ...
@@ -116,7 +116,7 @@ def user_config_dir(appname, roaming=True):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               same as user_data_dir
+        macOS:                  same as user_data_dir
         Unix:                   ~/.config/<AppName>
         Win *:                  same as user_data_dir
 
@@ -142,7 +142,7 @@ def site_config_dirs(appname):
         "appname" is the name of application.
 
     Typical user config directories are:
-        Mac OS X:   /Library/Application Support/<AppName>/
+        macOS:      /Library/Application Support/<AppName>/
         Unix:       /etc or $XDG_CONFIG_DIRS[i]/<AppName>/ for each value in
                     $XDG_CONFIG_DIRS
         Win XP:     C:\Documents and Settings\All Users\Application ...

tests/unit/test_wheel.py

@@ -155,7 +155,7 @@ class TestWheelFile(object):
     @patch('pip.pep425tags.get_platform', lambda: 'macosx_10_9_intel')
     def test_supported_osx_version(self):
         """
-        Wheels built for OS X 10.6 are supported on 10.9
+        Wheels built for macOS 10.6 are supported on 10.9
         """
         tags = pep425tags.get_supported(['27'], False)
         w = wheel.Wheel('simple-0.1-cp27-none-macosx_10_6_intel.whl')
@@ -168,7 +168,7 @@ class TestWheelFile(object):
     @patch('pip.pep425tags.get_platform', lambda: 'macosx_10_6_intel')
     def test_not_supported_osx_version(self):
         """
-        Wheels built for OS X 10.9 are not supported on 10.6
+        Wheels built for macOS 10.9 are not supported on 10.6
         """
         tags = pep425tags.get_supported(['27'], False)
         w = wheel.Wheel('simple-0.1-cp27-none-macosx_10_9_intel.whl')