Merge remote-tracking branch 'origin/master' into pslisten

* origin/master: (182 commits)
  giampaolo#1394 / windows / process exe(): convert errno 0 into ERROR_ACCESS_DENIED; errno 0 occurs when the Python process runs in 'Virtual Secure Mode'
  pre-release
  fix win num_handles() test
  update readme
  fix giampaolo#1111: use a lock to make Process.oneshot() thread safe
  pdate HISTORY
  giampaolo#1373: different approach to oneshot() cache (pass Process instances around - which is faster)
  use PROCESS_QUERY_LIMITED_INFORMATION also for username()
  Linux: refactor _parse_stat_file() and return a dict instead of a list (+ maintainability)
  fix giampaolo#1357: do not expose Process' memory_maps() and io_counters() methods if not supported by the kernel
  giampaolo#1376 Windows: check if variable is NULL before free()ing it
  enforce lack of support for Win XP
  fix giampaolo#1370: improper usage of CloseHandle() may lead to override the original error code resulting in raising a wrong exception
  update HISTORY
  (Windows) use PROCESS_QUERY_LIMITED_INFORMATION access rights (giampaolo#1376)
  update HISTORY
  revert 5398c48; let's do it in a separate branch
  giampaolo#1111 make Process.oneshot() thread-safe
  sort HISTORY
  give CREDITS to @EccoTheFlintstone for giampaolo#1368
  fix ionice set not working on windows x64 due to LENGTH_MISMATCH  (giampaolo#1368)
  make flake8 happy
  give CREDITS to @amanusk for giampaolo#1369 / giampaolo#1352 and update doc
  Add CPU frequency support for FreeBSD (giampaolo#1369)
  giampaolo#1359: add test case for cpu_count(logical=False) against lscpu utility
  disable false positive mem test on travis + osx
  fix PEP8 style mistakes
  give credits to @koenkooi for giampaolo#1360
  Fix giampaolo#1354 [Linux] disk_io_counters() fails on Linux kernel 4.18+ (giampaolo#1360)
  giampaolo#1350: give credits to @amanusk
  FreeBSD adding temperature sensors (WIP) (giampaolo#1350)
  pre release
  sensors_temperatures() / linux: convert defaultdict to dict
  fix giampaolo#1004: Process.io_counters() may raise ValueError
  fix giampaolo#1307: [Linux] disk_partitions() does not honour PROCFS_PATH
  refactor hasattr() checks as global constants
  giampaolo#1197 / linux / cpu_freq(): parse /proc/cpuinfo in case /sys/devices/system/cpu fs is not available
  fix giampaolo#1277 / osx / virtual_memory: 'available' and 'used' memory were not calculated properly
  travis / osx: set py 3.6
  travis: disable pypy; se py 3.7 on osx
  skip test on PYPY + Travis
  fix travis
  fix giampaolo#715: do not print exception on import time in case cpu_times() fails.
  fix different travis failures
  give CREDITS for giampaolo#1320 to @truthbk
  [aix] improve compilation on AIX, better support for gcc/g++ + fix cpu metrics (giampaolo#1320)
  give credits to @alxchk for giampaolo#1346 (sunOS)
  Fix giampaolo#1346 (giampaolo#1347)
  giampaolo#1284, giampaolo#1345 - give credits to @amanusk
  Add parsing for /sys/class/thermal (giampaolo#1345)
  Fix decoding error in tests
  catch UnicodeEncodeError on print()
  use memory tolerance in occasionally failing test
  Fix random 0xC0000001 errors when querying for Connections (giampaolo#1335)
  Correct capitalization of PyPI (giampaolo#1337)
  giampaolo#1341: move open() utilities/wrappers in _common.py
  Refactored ps() function in test_posix (giampaolo#1341)
  fix giampaolo#1343: document Process.as_dict() attrs values
  giampaolo#1332 - update HISTORY
  make psutil_debug() aware of PSUTIL_DEBUG (giampaolo#1332)
  also include PYPY (or try to :P)
  travis: add python 3.7 build
  add download badge
  remove failing test assertions
  remove failing test
  make test more robust
  pre release
  pre release
  set version to 5.4.7
  OSX / SMC / sensors: revert giampaolo#1284 (giampaolo#1325)
  setup.py: add py 3.7
  fix giampaolo#1323: [Linux] sensors_temperatures() may fail with ValueError
  fix failing linux tests
  giampaolo#1321 add unit tests
  giampaolo#1321: refactoring
  make disk_io_counters more robust (giampaolo#1324)
  fix typo
  Fix DeprecationWarning: invalid escape sequence (giampaolo#1318)
  remove old test
  update is_storage_device() docstring
  fix giampaolo#1305 / disk_io_counters() / Linux: assume SECTOR_SIZE is a fixed 512
  giampaolo#1313 remove test which no longer makes sense
  disk_io_counters() - linux: mimic iostat behavior (giampaolo#1313)
  fix wrong reference link in doc
  disambiguate TESTFN for parallel testing
  fix giampaolo#1309: add STATUS_PARKED constant and fix STATUS_IDLE (both on linux)
  give CREDITS to @sylvainduchesne for giampaolo#1294
  retain GIL when querying connections table (giampaolo#1306)
  Update index.rst (giampaolo#1308)
  fix giampaolo#1279: catch and skip ENODEV in net_if_stat()
  appveyor: retire 3.5, add 3.7
  revert file renaming of macos files; get them back to 'osx' prefix
  winmake: add upload-wheels cmd
  Rename OSX to macOS (giampaolo#1298)
  apveyor: reset py 3.4 and remove 3.7 (not available yet)
  try to fix occasional children() failure on Win: https://ci.appveyor.com/project/giampaolo/psutil/build/job/je3qyldbb86ff66h
  appveyor: remove py 3.4 and add 3.7
  giampaolo#1284: give credits to @amanusk + some minor adjustments
  little refactoring
  Osx temps (giampaolo#1284)
  ...

.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/install.sh

@@ -24,17 +24,9 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv install 2.7.10
             pyenv virtualenv 2.7.10 psutil
             ;;
-        # py32)
-        #     pyenv install 3.2.6
-        #     pyenv virtualenv 3.2.6 psutil
-        #     ;;
-        # py33)
-        #     pyenv install 3.3.6
-        #     pyenv virtualenv 3.3.6 psutil
-        #     ;;
-        py34)
-            pyenv install 3.4.3
-            pyenv virtualenv 3.4.3 psutil
+        py36)
+            pyenv install 3.6.6
+            pyenv virtualenv 3.6.6 psutil
             ;;
     esac
     pyenv rehash
@@ -45,10 +37,6 @@ if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]] || [[ $PYVER == 'py26' ]]; then
     pip install -U ipaddress unittest2 argparse mock==1.0.1
 elif [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then
     pip install -U ipaddress mock
-elif [[ $TRAVIS_PYTHON_VERSION == '3.2' ]] || [[ $PYVER == 'py32' ]]; then
-    pip install -U ipaddress mock
-elif [[ $TRAVIS_PYTHON_VERSION == '3.3' ]] || [[ $PYVER == 'py33' ]]; then
-    pip install -U ipaddress
 fi
 
 pip install -U coverage coveralls flake8 pep8 setuptools

.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

@@ -4,18 +4,23 @@ cache: pip
 matrix:
     include:
         # Linux
-        - python: 2.6
         - python: 2.7
         - python: 3.4
         - python: 3.5
         - python: 3.6
-        # OSX
+        - python: 3.7
+          dist: xenial
+          sudo: true
+        # macOS
         - language: generic
           os: osx
           env: PYVER=py27
         - language: generic
           os: osx
-          env: PYVER=py34
+          env: PYVER=py36
+        # pypy
+        # - python: pypy
+        # - python: pypy3
 install:
     - ./.ci/travis/install.sh
 script:

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
@@ -57,15 +57,15 @@ W: http://www.jayloden.com
 
 N: Arnon Yaari (wiggin15)
 W: https://github.com/wiggin15
-I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177
+I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214
 
 N: Jeff Tang
 W: https://github.com/mrjefftang
 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
@@ -486,7 +486,7 @@ I: 1042, 1079
 
 N: Oleksii Shevchuk
 W: https://github.com/alxchk
-I: 1077, 1093, 1091
+I: 1077, 1093, 1091, 1220, 1346
 
 N: Prodesire
 W: https://github.com/Prodesire
@@ -515,3 +515,59 @@ I: 1167
 N: janderbrain
 W: https://github.com/janderbrain
 I: 1169
+
+N: Dan Vinakovsky
+W: https://github.com/hexaclock
+I: 1216
+
+N: stswandering
+W: https://github.com/stswandering
+I: 1243
+
+N: Georg Sauthoff
+W: https://github.com/gsauthof
+I: 1193, 1194
+
+N: Maxime Mouial
+W: https://github.com/hush-hush
+I: 1239
+
+N: Denis Krienbühl
+W: https://github.com/href
+I: 1260
+
+N: Jean-Luc Migot
+W: https://github.com/jmigot-tehtris
+I: 1258, 1289
+
+N: Nikhil Marathe
+W: https://github.com/nikhilm
+I: 1278
+
+N: Alex Manuskin
+W: https://github.com/amanusk
+I: 1284, 1345, 1350, 1352
+
+N: Sylvain Duchesne
+W: https://github.com/sylvainduchesne
+I: 1294
+
+N: Lawrence Ye
+W: https://github.com/LEAFERx
+I: 1321
+
+N: Ilya Yanok
+W: https://github.com/yanok
+I: 1332
+
+N: Jaime Fullaondo
+W: https://github.com/truthbk
+I: 1320
+
+N: Koen Kooi
+W: https://github.com/koenkooi
+I: 1360
+
+N: EccoTheFlintstone
+W: https://github.com/EccoTheFlintstone
+I: 1368

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
 -------------