Merge 2bedda7 into 7a3ed44

.ci/README

@@ -1,3 +1,3 @@
 This directory contains support scripts for Travis and Appveyor continuous
 integration services.
-Travis is used to run tests on Linux and OSX, Appveyor runs tests on Windows.
+Travis is used to run tests on Linux and macOS, Appveyor runs tests on Windows.

.ci/travis/run.sh

@@ -5,7 +5,7 @@ set -x
 
 PYVER=`python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))'`
 
-# setup OSX
+# setup macOS
 if [[ "$(uname -s)" == 'Darwin' ]]; then
     if which pyenv > /dev/null; then
         eval "$(pyenv init -)"

.coveragerc

@@ -21,7 +21,7 @@ exclude_lines =
     if LITTLE_ENDIAN:
     if NETBSD
     if OPENBSD
-    if OSX
+    if MACOS
     if ppid_map is None:
     if PY3:
     if SUNOS

.travis.yml

@@ -9,7 +9,7 @@ matrix:
         - python: 3.4
         - python: 3.5
         - python: 3.6
-        # OSX
+        # macOS
         - language: generic
           os: osx
           env: PYVER=py27

CREDITS

@@ -34,7 +34,7 @@ Github usernames of people to CC on github when in need of help.
     - glebius, Gleb Smirnoff (#1013)
     - sunpoet, Po-Chuan Hsieh (pkg maintainer, #1105)
     - kostikbel, Konstantin Belousov (#1105)
-- OSX:
+- macOS:
     - whitlockjc, Jeremy Whitlock
 - Windows:
     - mrjefftang, Jeff Tang
@@ -65,7 +65,7 @@ I: 340, 529, 616, 653, 654, 648, 641
 
 N: Jeremy Whitlock
 E: jcscoobyrs@gmail.com
-D: great help with OSX C development.
+D: great help with macOS C development.
 I: 125, 150, 174, 206
 
 N: Landry Breuil

DEVGUIDE.rst

@@ -139,10 +139,10 @@ All of the services listed below are automatically run on ``git push``.
 Unit tests
 ----------
 
-Tests are automatically run for every GIT push on **Linux**, **OSX** and
+Tests are automatically run for every GIT push on **Linux**, **macOS** and
 **Windows** by using:
 
-- `Travis <https://travis-ci.org/giampaolo/psutil>`_ (Linux, OSX)
+- `Travis <https://travis-ci.org/giampaolo/psutil>`_ (Linux, macOS)
 - `Appveyor <https://ci.appveyor.com/project/giampaolo/psutil>`_ (Windows)
 
 Test files controlling these are
@@ -153,15 +153,15 @@ Both services run psutil test suite against all supported python version
 (2.6 - 3.6).
 Two icons in the home page (README) always show the build status:
 
-.. image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux%20/%20OSX
+.. image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux%20/%20macOS
     :target: https://travis-ci.org/giampaolo/psutil
-    :alt: Linux tests (Travis)
+    :alt: Linux and macOS tests (Travis)
 
 .. image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows
     :target: https://ci.appveyor.com/project/giampaolo/psutil
     :alt: Windows tests (Appveyor)
 
-OSX, BSD, AIX and Solaris are currently tested manually (sigh!).
+BSD, AIX and Solaris are currently tested manually.
 
 Test coverage
 -------------