[Python-modules-commits] [python-psutil] 02/02: Merge tag 'upstream/4.3.0'

[Adrian Alves]

This is an automated email from the git hooks/post-receive script.

alvesadrian-guest pushed a commit to branch master
in repository python-psutil.

commit 9a90069ae729c94363b9b1934ce98c8fecd89959
Merge: a097e78 fa474c3
Author: Adrian Alves <aalves at gmail.com>
Date:   Wed Jun 29 10:58:36 2016 -0300

    Merge tag 'upstream/4.3.0'
    
    Upstream version 4.3.0

 .ci/appveyor/download_exes.py     |   66 ++-
 .git-pre-commit                   |    2 +-
 CREDITS                           |    8 +
 DEVGUIDE.rst                      |   11 +-
 HISTORY.rst                       |   22 +
 Makefile                          |   62 ++-
 PKG-INFO                          |   11 +-
 README.rst                        |    9 +-
 appveyor.yml                      |    1 -
 docs/index.rst                    | 1078 +++++++++++++++++++------------------
 psutil.egg-info/PKG-INFO          |   11 +-
 psutil.egg-info/SOURCES.txt       |    1 +
 psutil/__init__.py                |    2 +-
 psutil/_common.py                 |  239 ++++----
 psutil/_compat.py                 |    3 +-
 psutil/_psbsd.py                  |  116 ++--
 psutil/_pslinux.py                |  315 ++++++-----
 psutil/_psosx.py                  |   80 ++-
 psutil/_psposix.py                |   40 +-
 psutil/_pssunos.py                |  120 +++--
 psutil/_psutil_bsd.c              |    4 +
 psutil/_psutil_windows.c          |   43 +-
 psutil/_pswindows.py              |  102 +++-
 psutil/arch/bsd/netbsd.c          |    1 +
 psutil/tests/__init__.py          |  403 ++++++++------
 psutil/tests/test_linux.py        |    9 +-
 psutil/tests/test_memory_leaks.py |    2 +-
 psutil/tests/test_posix.py        |   31 ++
 psutil/tests/test_process.py      |    8 +-
 psutil/tests/test_testutils.py    |   51 ++
 scripts/ps.py                     |   28 +-
 scripts/top.py                    |    8 +-
 32 files changed, 1778 insertions(+), 1109 deletions(-)

diff --cc Makefile
index 44762e1,2ec2856..3de30e8
--- a/Makefile
+++ b/Makefile
@@@ -4,9 -3,35 +3,36 @@@
  
  # You can set these variables from the command line.
  PYTHON    = python
 +PYTHONPATH = .
  TSCRIPT   = psutil/tests/runner.py
  
+ # For internal use.
+ PY3 := $(shell $(PYTHON) -c "import sys; print(sys.version_info[0] == 3)")
+ PYVER := $(shell $(PYTHON) -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
+ 
+ DEPS = coverage \
+ 	flake8 \
+ 	ipdb \
+ 	nose \
+ 	pep8 \
+ 	pyflakes \
+ 	requests \
+ 	sphinx \
+ 	sphinx-pypi-upload
+ ifeq ($(PYVER), 2.6)
+ 	DEPS += unittest2 ipaddress futures mock==1.0.1
+ endif
+ ifeq ($(PYVER), 2.7)
+ 	DEPS += unittest2 ipaddress futures mock
+ endif
+ 
+ ifeq ($(PY3), True)
+ 	URLLIB_IMPORTS := from urllib.request import urlopen, ssl
+ else
+ 	URLLIB_IMPORTS := from urllib2 import urlopen, ssl
+ endif
+ 
+ 
  all: test
  
  clean:
@@@ -44,37 -75,19 +76,19 @@@ setup-dev-env: install-git-hook
  	$(PYTHON) /tmp/get-pip.py --user
  	rm /tmp/get-pip.py
  	$(PYTHON) -m pip install --user --upgrade pip
- 	$(PYTHON) -m pip install --user --upgrade \
- 		coverage  \
- 		flake8 \
- 		ipaddress \
- 		ipdb \
- 		mock==1.0.1 \
- 		nose \
- 		pep8 \
- 		pyflakes \
- 		requests \
- 		sphinx \
- 		sphinx-pypi-upload \
- 		unittest2 \
- 
- install: build
- 	$(PYTHON) setup.py develop --user
- 
- uninstall:
- 	cd ..; $(PYTHON) -m pip uninstall -y -v psutil
+ 	$(PYTHON) -m pip install --user --upgrade $(DEPS)
  
 -test: install
 -	$(PYTHON) $(TSCRIPT)
 +test:
 +	PYTHONPATH=$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
  
 -test-process: install
 -	$(PYTHON) -m unittest -v psutil.tests.test_process
 +test-process:
 +	PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_process
  
 -test-system: install
 -	$(PYTHON) -m unittest -v psutil.tests.test_system
 +test-system:
 +	PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_system
  
 -test-memleaks: install
 -	$(PYTHON) psutil/tests/test_memory_leaks.py
 +test-memleaks:
 +	PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_memory_leaks.py
  
  # Run a specific test by name; e.g. "make test-by-name disk_" will run
  # all test methods containing "disk_" in their name.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-psutil.git