[Python-modules-commits] [python-psutil] 04/16: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Apr 10 19:44:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-psutil.
commit d2c983f9a09f1ae474700aa4d4d322da2a2d3121
Merge: be1e1e6 5aad529
Author: Sandro Tosi <morph at debian.org>
Date: Sun Apr 10 00:34:04 2016 +0100
merge patched into master
.ci/travis/install.sh | 37 +-
.ci/travis/run.sh | 12 +-
.coveragerc | 18 +-
.travis.yml | 27 +-
CREDITS | 28 +
DEVGUIDE.rst | 144 ++
DEVNOTES.rst | 10 -
HISTORY.rst | 68 +
IDEAS | 151 ++
INSTALL.rst | 144 +-
MANIFEST.in | 9 +-
Makefile | 18 +-
PKG-INFO | 43 +-
README.rst | 38 +-
TODO | 171 --
appveyor.yml | 27 +-
debian/.git-dpm | 6 +-
debian/patches/remove-google-analytics.patch | 2 +-
docs/index.rst | 468 +++--
make.bat | 62 +-
psutil.egg-info/PKG-INFO | 43 +-
psutil.egg-info/SOURCES.txt | 57 +-
psutil/__init__.py | 235 ++-
psutil/_common.py | 85 +-
psutil/_psbsd.py | 81 +-
psutil/_pslinux.py | 297 ++-
psutil/_psosx.py | 38 +-
psutil/_psposix.py | 2 +-
psutil/_pssunos.py | 73 +-
psutil/_psutil_bsd.c | 68 +-
psutil/_psutil_linux.c | 22 +-
psutil/_psutil_osx.c | 203 +-
psutil/_psutil_osx.h | 2 +
psutil/_psutil_posix.c | 2 +-
psutil/_psutil_sunos.c | 69 +-
psutil/_psutil_windows.c | 507 +++--
psutil/_psutil_windows.h | 2 +
psutil/_pswindows.py | 69 +-
psutil/arch/bsd/freebsd.c | 56 +-
psutil/arch/bsd/freebsd.h | 1 +
psutil/arch/bsd/netbsd.c | 46 +-
psutil/arch/bsd/netbsd.h | 1 +
psutil/arch/bsd/openbsd.c | 50 +-
psutil/arch/bsd/openbsd.h | 1 +
psutil/arch/osx/process_info.c | 122 ++
psutil/arch/osx/process_info.h | 1 +
psutil/arch/windows/ntextapi.h | 111 ++
psutil/arch/windows/process_info.c | 628 ++++++-
psutil/arch/windows/process_info.h | 3 +-
psutil/tests/README.rst | 19 +
psutil/tests/__init__.py | 603 ++++++
psutil/tests/runner.py | 25 +
test/_bsd.py => psutil/tests/test_bsd.py | 137 +-
test/_linux.py => psutil/tests/test_linux.py | 994 +++++++---
{test => psutil/tests}/test_memory_leaks.py | 65 +-
psutil/tests/test_misc.py | 437 +++++
test/_osx.py => psutil/tests/test_osx.py | 40 +-
test/_posix.py => psutil/tests/test_posix.py | 203 +-
.../test_psutil.py => psutil/tests/test_process.py | 1948 ++++----------------
test/_sunos.py => psutil/tests/test_sunos.py | 19 +-
psutil/tests/test_system.py | 692 +++++++
test/_windows.py => psutil/tests/test_windows.py | 134 +-
{examples => scripts}/disk_usage.py | 2 +-
{examples => scripts}/free.py | 2 +-
{examples => scripts}/ifconfig.py | 2 +-
{examples => scripts}/iotop.py | 2 +-
{examples => scripts}/killall.py | 0
{examples => scripts}/meminfo.py | 2 +-
{examples => scripts}/netstat.py | 2 +-
{examples => scripts}/nettop.py | 2 +-
{examples => scripts}/pidof.py | 0
{examples => scripts}/pmap.py | 2 +-
examples/process_detail.py => scripts/procinfo.py | 12 +-
scripts/procsmem.py | 101 +
{examples => scripts}/ps.py | 2 +-
{examples => scripts}/pstree.py | 2 +-
{examples => scripts}/top.py | 6 +-
{examples => scripts}/who.py | 2 +-
setup.py | 30 +-
test/README.rst | 21 -
tox.ini | 4 +-
81 files changed, 6598 insertions(+), 3272 deletions(-)
diff --cc debian/.git-dpm
index ebaa551,0000000..c686618
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
- 0cd0ed4652a397992bb43c5a1a316b80146139f7
- 0cd0ed4652a397992bb43c5a1a316b80146139f7
- 120c55e707cbc9152171f0d82890d996e7484598
++5aad5293235e33f0254dc1472b0e52310ffcc53f
++5aad5293235e33f0254dc1472b0e52310ffcc53f
++2c309ebac47893e498f97c81dde0e61ce8f7c4a5
+2c309ebac47893e498f97c81dde0e61ce8f7c4a5
+python-psutil_4.1.0.orig.tar.gz
+c1f4e1581e5b6aaee549093b624c78e3c3a1e1ce
+301330
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-google-analytics.patch
index 6ce6253,0000000..8c6b548
mode 100644,000000..100644
--- a/debian/patches/remove-google-analytics.patch
+++ b/debian/patches/remove-google-analytics.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 0cd0ed4652a397992bb43c5a1a316b80146139f7 Mon Sep 17 00:00:00 2001
++From 5aad5293235e33f0254dc1472b0e52310ffcc53f Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 12:44:13 -0700
+Subject: remove Google Analytics tracking from documentation
+
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-05-02
+Patch-Name: remove-google-analytics.patch
+---
+ docs/_template/page.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/_template/page.html b/docs/_template/page.html
+index 04b47b4..6f699f9 100644
+--- a/docs/_template/page.html
++++ b/docs/_template/page.html
+@@ -42,7 +42,7 @@
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
++ ga.src = '';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
--
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