summaryrefslogtreecommitdiff
path: root/DEVGUIDE.rst
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-08-04 02:26:29 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2015-08-04 02:26:29 +0200
commit29aad0a5becffa8a141d0ce0e48492e1a39eaca6 (patch)
tree7e998caf073a4cb790ed8392adee4acc01f77494 /DEVGUIDE.rst
parent2d2bfe6de68bc375453247058776d9d92358eb8f (diff)
downloadpsutil-29aad0a5becffa8a141d0ce0e48492e1a39eaca6.tar.gz
attempt some fixes for OSX/travis failures; also update HISTORY/CREDITS with @mrjefftang contributions
Diffstat (limited to 'DEVGUIDE.rst')
-rw-r--r--DEVGUIDE.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/DEVGUIDE.rst b/DEVGUIDE.rst
index d8df9434..cfbc1789 100644
--- a/DEVGUIDE.rst
+++ b/DEVGUIDE.rst
@@ -74,15 +74,18 @@ All of the services listed below are automatically run on ``git push``.
Tests
-----
-Tests are automatically run on push on Linux and Windows by using:
+Tests are automatically run for every GIT push on **Linux**, **OSX** and
+**Windows** by using:
-- `Travis <https://travis-ci.org/giampaolo/psutil>`_ (Linux)
+- `Travis <https://travis-ci.org/giampaolo/psutil>`_ (Linux, OSX)
- `Appveyor <https://ci.appveyor.com/project/giampaolo/psutil>`_ (Windows)
-Test files controlling these are `.travis.yml <https://github.com/giampaolo/psutil/blob/master/.travis.yml>`_
-and `appveyor.yml <https://github.com/giampaolo/psutil/blob/master/appveyor.yml>`_.
+Test files controlling these are
+`.travis.yml <https://github.com/giampaolo/psutil/blob/master/.travis.yml>`_
+and
+`appveyor.yml <https://github.com/giampaolo/psutil/blob/master/appveyor.yml>`_.
Both services run psutil test suite against all supported python version
-(2.6 - 3.5).
+(2.6 - 3.4).
Two icons in the home page (README) always show the build status:
.. image:: https://api.travis-ci.org/giampaolo/psutil.png?branch=master