[Python-modules-commits] [python-psutil] 05/08: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Mon Dec 11 02:14:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-psutil.
commit 2bfad4f4182fd3caa5b7c1230e71f82878b33264
Merge: 4da5e23 0265cee
Author: Sandro Tosi <morph at debian.org>
Date: Sun Dec 10 09:34:10 2017 -0500
merge patched into master
CREDITS | 6 +-
DEVGUIDE.rst | 58 +++--
HISTORY.rst | 26 ++
INSTALL.rst | 59 ++---
MANIFEST.in | 1 +
Makefile | 57 +++--
PKG-INFO | 5 +-
README.rst | 3 +-
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 30 +--
.../0002-pass-PYTHONPATH-to-the-test-runner.patch | 66 +-----
docs/index.rst | 25 +-
psutil.egg-info/PKG-INFO | 5 +-
psutil.egg-info/SOURCES.txt | 1 +
psutil/__init__.py | 261 +++++++--------------
psutil/_common.py | 4 +-
psutil/_exceptions.py | 94 ++++++++
psutil/_psaix.py | 17 +-
psutil/_psbsd.py | 14 +-
psutil/_pslinux.py | 50 +++-
psutil/_psosx.py | 55 ++++-
psutil/_psposix.py | 12 +-
psutil/_pssunos.py | 14 +-
psutil/_psutil_aix.c | 8 +-
psutil/_psutil_bsd.c | 8 +-
psutil/_psutil_common.c | 99 ++++----
psutil/_psutil_common.h | 14 +-
psutil/_psutil_linux.c | 8 +-
psutil/_psutil_osx.c | 141 +++++++++--
psutil/_psutil_posix.c | 15 +-
psutil/_psutil_sunos.c | 8 +-
psutil/_psutil_windows.c | 149 +++++++-----
psutil/_pswindows.py | 11 +-
psutil/arch/freebsd/proc_socks.c | 2 +-
psutil/arch/freebsd/specific.c | 14 +-
psutil/arch/netbsd/specific.c | 10 +-
psutil/arch/openbsd/specific.c | 10 +-
psutil/arch/osx/process_info.c | 8 +-
psutil/arch/windows/process_info.c | 10 +-
psutil/tests/__init__.py | 54 +++--
psutil/tests/test_aix.py | 0
psutil/tests/test_connections.py | 2 +
psutil/tests/test_contracts.py | 24 +-
psutil/tests/test_linux.py | 20 ++
psutil/tests/test_misc.py | 27 ++-
psutil/tests/test_osx.py | 13 +
psutil/tests/test_posix.py | 11 +-
psutil/tests/test_process.py | 48 ++--
psutil/tests/test_system.py | 4 +-
scripts/internal/print_announce.py | 7 +-
scripts/internal/winmake.py | 42 +++-
51 files changed, 996 insertions(+), 640 deletions(-)
diff --cc debian/.git-dpm
index 6074f1d,0000000..59d6039
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- af75554b4f7a1a27b812613c29bc65c205d5d995
- af75554b4f7a1a27b812613c29bc65c205d5d995
- 0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
++0265cee5a90d1c1195ef54568b0cb4061e668344
++0265cee5a90d1c1195ef54568b0cb4061e668344
++714e49e4918a502df13c6e90da062acdaec164d3
+714e49e4918a502df13c6e90da062acdaec164d3
+python-psutil_5.4.2.orig.tar.gz
+39c9c0c5573cd9d24f2d9626742fcc50646c33fa
+411888
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-dont-depend-on-install-when-running-tests.patch
index 1706706,0000000..56c5b1e
mode 100644,000000..100644
--- a/debian/patches/0001-dont-depend-on-install-when-running-tests.patch
+++ b/debian/patches/0001-dont-depend-on-install-when-running-tests.patch
@@@ -1,65 -1,0 +1,65 @@@
- From c4a0ef1c985caaf6c2a399109ffe81ddd2b01f72 Mon Sep 17 00:00:00 2001
++From 8fd54f875dfab4b515937eca2824a52915973006 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 10 Apr 2016 13:13:43 +0100
+Subject: dont depend on install when running tests
+
+---
+ Makefile | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index 035c72f..0529894 100644
++index 080e334..4aea76f 100644
+--- a/Makefile
++++ b/Makefile
- @@ -107,51 +107,39 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
++@@ -108,51 +108,39 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
+ # ===================================================================
+
+ test: ## Run all tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
++ $(TEST_PREFIX) $(PYTHON) $(TSCRIPT)
+
+ test-process: ## Run process-related API tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_process
++ $(TEST_PREFIX) $(PYTHON) -m unittest -v psutil.tests.test_process
+
+ test-system: ## Run system-related API tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_system
++ $(TEST_PREFIX) $(PYTHON) -m unittest -v psutil.tests.test_system
+
+ test-misc: ## Run miscellaneous tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_misc.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_misc.py
+
+ test-unicode: ## Test APIs dealing with strings.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_unicode.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_unicode.py
+
+ test-contracts: ## APIs sanity tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_contracts.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_contracts.py
+
+ test-connections: ## Test net_connections() and Process.connections().
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_connections.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_connections.py
+
+ test-posix: ## POSIX specific tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_posix.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_posix.py
+
+ test-platform: ## Run specific platform tests only.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
+
+ test-memleaks: ## Memory leak tests.
+- ${MAKE} install
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_memory_leaks.py
++ $(TEST_PREFIX) $(PYTHON) psutil/tests/test_memory_leaks.py
+
+ test-by-name: ## e.g. make test-by-name ARGS=psutil.tests.test_system.TestSystemAPIs
+- ${MAKE} install
- @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v $(ARGS)
++ @$(TEST_PREFIX) $(PYTHON) -m unittest -v $(ARGS)
+
+ test-coverage: ## Run test coverage.
+- ${MAKE} install
+ # Note: coverage options are controlled by .coveragerc file
+ rm -rf .coverage htmlcov
- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m coverage run $(TSCRIPT)
++ $(TEST_PREFIX) $(PYTHON) -m coverage run $(TSCRIPT)
diff --cc debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
index e105d89,0000000..fe8c7d4
mode 100644,000000..100644
--- a/debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
+++ b/debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
@@@ -1,76 -1,0 +1,30 @@@
- From af75554b4f7a1a27b812613c29bc65c205d5d995 Mon Sep 17 00:00:00 2001
++From 0265cee5a90d1c1195ef54568b0cb4061e668344 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Sun, 10 Apr 2016 13:17:47 +0100
+Subject: pass PYTHONPATH to the test runner
+
+---
- Makefile | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
++ Makefile | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
- index 0529894..ac6ce40 100644
++index 4aea76f..6b7671c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@
+ # You can set the variables below from the command line.
+
+ PYTHON = python
++PYTHONPATH = .
+ TSCRIPT = psutil/tests/__main__.py
+ ARGS =
+ # List of nice-to-have dev libs.
- @@ -107,42 +108,42 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
- # ===================================================================
++@@ -26,7 +27,7 @@ DEPS = \
+
- test: ## Run all tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
++ # In not in a virtualenv, add --user options for install commands.
++ INSTALL_OPTS = `$(PYTHON) -c "import sys; print('' if hasattr(sys, 'real_prefix') else '--user')"`
++-TEST_PREFIX = PYTHONWARNINGS=all PSUTIL_TESTING=1 PSUTIL_DEBUG=1
+++TEST_PREFIX = PYTHONWARNINGS=all PSUTIL_TESTING=1 PSUTIL_DEBUG=1 PYTHONPATH=$(PYTHONPATH)
+
- test-process: ## Run process-related API tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_process
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_process
++ all: test
+
- test-system: ## Run system-related API tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_system
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_system
-
- test-misc: ## Run miscellaneous tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_misc.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_misc.py
-
- test-unicode: ## Test APIs dealing with strings.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_unicode.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_unicode.py
-
- test-contracts: ## APIs sanity tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_contracts.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_contracts.py
-
- test-connections: ## Test net_connections() and Process.connections().
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_connections.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_connections.py
-
- test-posix: ## POSIX specific tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_posix.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_posix.py
-
- test-platform: ## Run specific platform tests only.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
-
- test-memleaks: ## Memory leak tests.
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_memory_leaks.py
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_memory_leaks.py
-
- test-by-name: ## e.g. make test-by-name ARGS=psutil.tests.test_system.TestSystemAPIs
- - @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v $(ARGS)
- + PYTHONPATH=$(PYTHONPATH) @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v $(ARGS)
-
- test-coverage: ## Run test coverage.
- # Note: coverage options are controlled by .coveragerc file
- rm -rf .coverage htmlcov
- - PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m coverage run $(TSCRIPT)
- + PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m coverage run $(TSCRIPT)
- $(PYTHON) -m coverage report
- @echo "writing results to htmlcov/index.html"
- $(PYTHON) -m coverage html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-psutil.git
More information about the Python-modules-commits
mailing list