[Python-modules-commits] [python-psutil] 05/14: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Nov 26 01:56:09 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 2c498b519efff22b8b474b6a665ab77257333148
Merge: 7cadf33 ca91fc9
Author: Sandro Tosi <morph at debian.org>
Date: Sat Nov 25 17:22:26 2017 -0500
merge patched into master
.coveragerc | 35 +-
.git-pre-commit | 118 ++
.gitignore | 18 +
CREDITS | 101 +-
DEVGUIDE.rst | 68 +-
HISTORY.rst | 838 +++++++++++-
IDEAS | 24 +-
INSTALL.rst | 37 +-
MANIFEST.in | 140 +-
Makefile | 206 ++-
PKG-INFO | 180 ++-
README.rst | 170 ++-
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 65 +
...dont-depend-on-install-when-running-tests.patch | 58 -
.../0002-pass-PYTHONPATH-to-the-test-runner.patch | 78 ++
.../0003-pass-PYTHONPATH-to-the-test-runner.patch | 66 -
debian/patches/remove-google-analytics.patch | 26 -
debian/patches/series | 5 +-
docs/Makefile | 57 +-
docs/README | 4 +-
docs/_static/css/custom.css | 518 ++++++++
docs/_static/favicon.ico | Bin 0 -> 15086 bytes
docs/_template/globaltoc.html | 12 -
docs/_template/indexcontent.html | 4 -
docs/_template/indexsidebar.html | 8 -
docs/_template/page.html | 66 -
docs/_themes/pydoctheme/static/pydoctheme.css | 197 ---
docs/_themes/pydoctheme/theme.conf | 23 -
docs/conf.py | 235 +++-
docs/index.rst | 1384 +++++++++++++++-----
docs/make.bat | 274 +++-
make.bat | 4 +-
psutil.egg-info/PKG-INFO | 180 ++-
psutil.egg-info/SOURCES.txt | 61 +-
psutil.egg-info/not-zip-safe | 1 +
psutil.egg-info/requires.txt | 3 +
psutil/DEVNOTES | 5 +
psutil/__init__.py | 549 +++++---
psutil/_common.py | 158 ++-
psutil/_psaix.py | 582 ++++++++
psutil/_psbsd.py | 92 +-
psutil/_pslinux.py | 517 ++++++--
psutil/_psosx.py | 134 +-
psutil/_psposix.py | 33 +-
psutil/_pssunos.py | 87 +-
psutil/_psutil_aix.c | 986 ++++++++++++++
psutil/_psutil_bsd.c | 220 ++--
psutil/_psutil_common.c | 111 +-
psutil/_psutil_common.h | 12 +-
psutil/_psutil_linux.c | 61 +-
psutil/_psutil_osx.c | 164 ++-
psutil/_psutil_posix.c | 107 +-
psutil/_psutil_posix.h | 3 +
psutil/_psutil_sunos.c | 378 ++++--
psutil/_psutil_windows.c | 477 ++++---
psutil/_pswindows.py | 245 ++--
psutil/arch/aix/common.c | 79 ++
psutil/arch/aix/common.h | 31 +
psutil/arch/aix/ifaddrs.c | 149 +++
psutil/arch/{solaris/v10 => aix}/ifaddrs.h | 15 +-
psutil/arch/aix/net_connections.c | 287 ++++
psutil/arch/aix/net_connections.h | 15 +
psutil/arch/aix/net_kernel_structs.h | 110 ++
psutil/arch/bsd/freebsd_socks.c | 631 ---------
psutil/arch/freebsd/proc_socks.c | 368 ++++++
.../{_psutil_posix.h => arch/freebsd/proc_socks.h} | 4 +
psutil/arch/{bsd/freebsd.c => freebsd/specific.c} | 117 +-
psutil/arch/{bsd/freebsd.h => freebsd/specific.h} | 3 +
psutil/arch/freebsd/sys_socks.c | 362 +++++
.../{bsd/freebsd_socks.h => freebsd/sys_socks.h} | 1 -
psutil/arch/{bsd/netbsd_socks.c => netbsd/socks.c} | 38 +-
psutil/arch/{bsd/netbsd_socks.h => netbsd/socks.h} | 0
psutil/arch/{bsd/netbsd.c => netbsd/specific.c} | 30 +-
psutil/arch/{bsd/netbsd.h => netbsd/specific.h} | 0
psutil/arch/{bsd/openbsd.c => openbsd/specific.c} | 61 +-
psutil/arch/{bsd/openbsd.h => openbsd/specific.h} | 0
psutil/arch/osx/process_info.c | 39 +-
psutil/arch/solaris/environ.c | 405 ++++++
psutil/arch/solaris/environ.h | 19 +
psutil/arch/solaris/v10/ifaddrs.c | 14 +-
psutil/arch/solaris/v10/ifaddrs.h | 6 +-
psutil/arch/windows/inet_ntop.c | 26 +-
psutil/arch/windows/inet_ntop.h | 11 +-
psutil/arch/windows/ntextapi.h | 12 +-
psutil/arch/windows/process_handles.c | 17 +-
psutil/arch/windows/process_handles.h | 2 +-
psutil/arch/windows/process_info.c | 499 ++++---
psutil/arch/windows/process_info.h | 14 +-
psutil/arch/windows/services.c | 111 +-
psutil/tests/README.rst | 28 +-
psutil/tests/__init__.py | 898 +++++++++----
psutil/tests/__main__.py | 96 ++
psutil/tests/runner.py | 27 -
psutil/tests/test_aix.py | 121 ++
psutil/tests/test_bsd.py | 85 +-
psutil/tests/test_connections.py | 523 ++++++++
psutil/tests/test_contracts.py | 631 +++++++++
psutil/tests/test_linux.py | 1004 +++++++++++---
psutil/tests/test_memory_leaks.py | 183 ++-
psutil/tests/test_misc.py | 466 ++++++-
psutil/tests/test_osx.py | 100 +-
psutil/tests/test_posix.py | 147 ++-
psutil/tests/test_process.py | 1321 ++++++-------------
psutil/tests/test_sunos.py | 6 +-
psutil/tests/test_system.py | 229 +++-
psutil/tests/test_unicode.py | 367 ++++++
psutil/tests/test_windows.py | 302 ++++-
scripts/battery.py | 48 +
scripts/cpu_distribution.py | 96 ++
scripts/fans.py | 36 +
scripts/ifconfig.py | 56 +-
scripts/internal/README | 2 +
scripts/internal/bench_oneshot.py | 7 +-
scripts/internal/check_broken_links.py | 259 ++++
scripts/internal/download_exes.py | 108 +-
scripts/internal/generate_manifest.py | 35 +
scripts/internal/print_announce.py | 2 +-
scripts/internal/print_timeline.py | 53 +
scripts/internal/winmake.py | 196 ++-
scripts/netstat.py | 7 +-
scripts/pidof.py | 25 +-
scripts/procinfo.py | 5 +-
scripts/sensors.py | 93 ++
scripts/temperatures.py | 48 +
scripts/who.py | 13 +-
scripts/winservices.py | 2 +-
setup.cfg | 1 -
setup.py | 148 ++-
tox.ini | 4 +-
130 files changed, 16356 insertions(+), 5089 deletions(-)
diff --cc debian/.git-dpm
index 6affc61,0000000..a0a7de2
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
- 6db2aef35611e3d5ce20915adf2870e1d4a4d1b6
- 6db2aef35611e3d5ce20915adf2870e1d4a4d1b6
- 8bc102f9570a371f178b15248492a84f0f47f570
++ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3
++ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3
++0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
+0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
+python-psutil_5.4.1.orig.tar.gz
+6305bc320d7b9d37967e5e004e2404beefa71a34
+408489
+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 0000000,0000000..1706706
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-dont-depend-on-install-when-running-tests.patch
@@@ -1,0 -1,0 +1,65 @@@
++From c4a0ef1c985caaf6c2a399109ffe81ddd2b01f72 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
++--- a/Makefile
+++++ b/Makefile
++@@ -107,51 +107,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-process: ## Run process-related API tests.
++- ${MAKE} install
++ PSUTIL_TESTING=1 PYTHONWARNINGS=all $(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-misc: ## Run miscellaneous tests.
++- ${MAKE} install
++ PSUTIL_TESTING=1 PYTHONWARNINGS=all $(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-contracts: ## APIs sanity tests.
++- ${MAKE} install
++ PSUTIL_TESTING=1 PYTHONWARNINGS=all $(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-posix: ## POSIX specific tests.
++- ${MAKE} install
++ PSUTIL_TESTING=1 PYTHONWARNINGS=all $(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-memleaks: ## Memory leak tests.
++- ${MAKE} install
++ 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
++- ${MAKE} install
++ @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(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)
diff --cc debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
index 0000000,0000000..c6b3f1e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
@@@ -1,0 -1,0 +1,78 @@@
++From ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3 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 | 26 ++++++++++++++------------
++ 1 file changed, 14 insertions(+), 12 deletions(-)
++
++diff --git a/Makefile b/Makefile
++index 0529894..43edc7c 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.
++@@ -106,43 +107,44 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
++ # Tests
++ # ===================================================================
++
+++<<<<<<< 0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
++ test: ## Run all tests.
++- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
+++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
++
++ 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
++
++ 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
diff --cc debian/patches/series
index b5c35d4,0000000..01fc9f8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- remove-google-analytics.patch
- 0002-dont-depend-on-install-when-running-tests.patch
- 0003-pass-PYTHONPATH-to-the-test-runner.patch
++0001-dont-depend-on-install-when-running-tests.patch
++0002-pass-PYTHONPATH-to-the-test-runner.patch
--
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