Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename OSX to macOS #1298

Merged
merged 8 commits into from
Jun 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/README
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion .ci/travis/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 -)"
Expand Down
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
- python: 3.4
- python: 3.5
- python: 3.6
# OSX
# macOS
- language: generic
os: osx
env: PYVER=py27
Expand Down
4 changes: 2 additions & 2 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -65,7 +65,7 @@ I: 340, 529, 616, 653, 654, 648, 641

N: Jeremy Whitlock
E: [email protected]
D: great help with OSX C development.
D: great help with macOS C development.
I: 125, 150, 174, 206

N: Landry Breuil
Expand Down
10 changes: 5 additions & 5 deletions DEVGUIDE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
-------------
Expand Down
Loading