diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-05-03 06:32:44 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-05-03 06:32:49 -0400 |
| commit | 5d6fe655504d2ab327de70eae9912abd82b8f85a (patch) | |
| tree | 8ea626b1cabe75cc79f0743f3474f98f1d89ce8d /docs | |
| parent | 3aeec3f0e989516e9229d9a75f5a038929dee6a6 (diff) | |
| parent | 8c360dfd6361a15d1bbdfadb5fd0927a9a4a4cef (diff) | |
| download | external_python_setuptools-5d6fe655504d2ab327de70eae9912abd82b8f85a.tar.gz external_python_setuptools-5d6fe655504d2ab327de70eae9912abd82b8f85a.tar.bz2 external_python_setuptools-5d6fe655504d2ab327de70eae9912abd82b8f85a.zip | |
Merge pull request #2062.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/history.txt | 2 | ||||
| -rw-r--r-- | docs/pkg_resources.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/history.txt b/docs/history.txt index 385cfa7e..faf7adfe 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -12,7 +12,7 @@ Credits * The original design for the ``.egg`` format and the ``pkg_resources`` API was co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first - version of ``pkg_resources``, and supplied the OS X operating system version + version of ``pkg_resources``, and supplied the macOS operating system version compatibility algorithm. * Ian Bicking implemented many early "creature comfort" features of diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index b887a923..71568c1a 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -1621,7 +1621,7 @@ Platform Utilities ``get_build_platform()`` Return this platform's identifier string. For Windows, the return value - is ``"win32"``, and for Mac OS X it is a string of the form + is ``"win32"``, and for macOS it is a string of the form ``"macosx-10.4-ppc"``. All other platforms return the same uname-based string that the ``distutils.util.get_platform()`` function returns. This string is the minimum platform version required by distributions built @@ -1641,7 +1641,7 @@ Platform Utilities considered a wildcard, and the platforms are therefore compatible. Likewise, if the platform strings are equal, they're also considered compatible, and ``True`` is returned. Currently, the only non-equal - platform strings that are considered compatible are Mac OS X platform + platform strings that are considered compatible are macOS platform strings with the same hardware type (e.g. ``ppc``) and major version (e.g. ``10``) with the `provided` platform's minor version being less than or equal to the `required` platform's minor version. @@ -1674,7 +1674,7 @@ File/Path Utilities the same filesystem location if they have equal ``normalized_path()`` values. Specifically, this is a shortcut for calling ``os.path.realpath`` and ``os.path.normcase`` on `path`. Unfortunately, on certain platforms - (notably Cygwin and Mac OS X) the ``normcase`` function does not accurately + (notably Cygwin and macOS) the ``normcase`` function does not accurately reflect the platform's case-sensitivity, so there is always the possibility of two apparently-different paths being equal on such platforms. |