[Python-modules-commits] [python-psutil] 06/12: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sun Dec 11 17:25:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-psutil.
commit aec1f9005a72f27a4e1a8bae5947b46dcdf82ec3
Merge: 7adc392 071c1a1
Author: Ondřej Nový <onovy at debian.org>
Date: Sun Dec 11 17:56:34 2016 +0100
merge patched into master
.ci/travis/install.sh | 4 +-
.ci/travis/run.sh | 16 +-
.git-pre-commit | 79 +-
CREDITS | 18 +
DEVGUIDE.rst | 15 +-
HISTORY.rst | 2213 +++++++++++++++-----
IDEAS | 16 +-
INSTALL.rst | 48 +-
MANIFEST.in | 1 +
Makefile | 130 +-
PKG-INFO | 63 +-
README.rst | 59 +-
appveyor.yml | 23 +
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 64 +-
.../0003-pass-PYTHONPATH-to-the-test-runner.patch | 68 +-
debian/patches/remove-google-analytics.patch | 2 +-
docs/_static/copybutton.js | 57 -
docs/_static/favicon.ico | Bin 15086 -> 0 bytes
docs/_static/logo.png | Bin 4922 -> 0 bytes
docs/_static/sidebar.js | 161 --
docs/index.rst | 309 ++-
docs/make.bat | 274 +--
make.bat | 216 +-
psutil.egg-info/PKG-INFO | 63 +-
psutil.egg-info/SOURCES.txt | 13 +-
psutil/__init__.py | 174 +-
psutil/_common.py | 53 +
psutil/_psbsd.py | 127 +-
psutil/_pslinux.py | 287 ++-
psutil/_psosx.py | 108 +-
psutil/_pssunos.py | 53 +-
psutil/_psutil_bsd.c | 419 ++--
psutil/_psutil_common.c | 89 +
psutil/_psutil_common.h | 5 +
psutil/_psutil_linux.c | 40 +-
psutil/_psutil_osx.c | 531 ++---
psutil/_psutil_posix.c | 114 +-
psutil/_psutil_posix.h | 10 -
psutil/_psutil_sunos.c | 3 +-
psutil/_psutil_windows.c | 330 +--
psutil/_pswindows.py | 81 +-
psutil/arch/bsd/freebsd.c | 79 +-
psutil/arch/bsd/freebsd.h | 2 -
psutil/arch/bsd/freebsd_socks.c | 6 +-
psutil/arch/bsd/netbsd.c | 87 +-
psutil/arch/bsd/netbsd.h | 4 +-
psutil/arch/bsd/netbsd_socks.c | 503 ++---
psutil/arch/bsd/openbsd.c | 47 +-
psutil/arch/bsd/openbsd.h | 2 -
psutil/arch/osx/process_info.c | 90 +-
psutil/arch/osx/process_info.h | 6 +-
psutil/arch/windows/process_handles.c | 6 +-
psutil/arch/windows/process_info.c | 20 +-
psutil/arch/windows/process_info.h | 7 +
psutil/arch/windows/services.c | 1 +
psutil/tests/__init__.py | 384 ++--
psutil/tests/runner.py | 2 +
psutil/tests/test_bsd.py | 141 +-
psutil/tests/test_linux.py | 450 ++--
psutil/tests/test_memory_leaks.py | 467 +++--
psutil/tests/test_misc.py | 244 ++-
psutil/tests/test_osx.py | 87 +-
psutil/tests/test_posix.py | 13 +-
psutil/tests/test_process.py | 545 +++--
psutil/tests/test_sunos.py | 2 +-
psutil/tests/test_system.py | 99 +-
psutil/tests/test_windows.py | 453 ++--
scripts/disk_usage.py | 1 +
scripts/free.py | 1 +
scripts/ifconfig.py | 83 +-
scripts/internal/README | 2 +
scripts/internal/bench_oneshot.py | 151 ++
scripts/internal/bench_oneshot_2.py | 53 +
.../appveyor => scripts/internal}/download_exes.py | 10 +-
scripts/internal/print_announce.py | 116 +
scripts/internal/winmake.py | 381 ++++
scripts/iotop.py | 19 +-
scripts/killall.py | 4 +-
scripts/meminfo.py | 1 +
scripts/netstat.py | 1 +
scripts/nettop.py | 1 +
scripts/pidof.py | 36 +-
scripts/pmap.py | 1 +
scripts/procinfo.py | 359 +++-
scripts/procsmem.py | 36 +-
scripts/ps.py | 1 +
scripts/top.py | 15 +-
scripts/who.py | 1 +
setup.py | 88 +-
90 files changed, 6980 insertions(+), 4470 deletions(-)
diff --cc debian/.git-dpm
index 6a70df0,0000000..7fd2d15
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
- d878eb36d1472bffbe7e633306250bf0bb577f3d
- d878eb36d1472bffbe7e633306250bf0bb577f3d
- 59d1042fdd4f68524fc5f231281e35602d85d86e
++071c1a174f9e9f89d6048e9e377fd4a068e89dc6
++071c1a174f9e9f89d6048e9e377fd4a068e89dc6
++1e8831423569075965a2c16727ccd5b28f43a9dd
+1e8831423569075965a2c16727ccd5b28f43a9dd
+python-psutil_5.0.0.orig.tar.gz
+a6a4b054672c816da128403e624f1595b5a110ac
+327186
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-dont-depend-on-install-when-running-tests.patch
index 8fa3c0c,0000000..bebb15d
mode 100644,000000..100644
--- a/debian/patches/0002-dont-depend-on-install-when-running-tests.patch
+++ b/debian/patches/0002-dont-depend-on-install-when-running-tests.patch
@@@ -1,56 -1,0 +1,58 @@@
- From 0b963d7f27305028e9578ddb63fac7dbe4638152 Mon Sep 17 00:00:00 2001
++From 8f5a6e6446ab23fba82bf5d178197d2892b06d4b 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 | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
++ Makefile | 16 ++++++++--------
++ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index b8c118f..e298e0a 100644
++index c91d3b9..29fc528 100644
+--- a/Makefile
++++ b/Makefile
- @@ -73,6 +73,7 @@ install: build
- uninstall:
- cd ..; $(PYTHON) -m pip uninstall -y -v psutil
++@@ -116,36 +116,36 @@ setup-dev-env: install-git-hooks install-pip
++ # ===================================================================
+
- +<<<<<<< 59d1042fdd4f68524fc5f231281e35602d85d86e
- # Install PIP (only if necessary).
- install-pip:
- $(PYTHON) -c \
- @@ -124,20 +125,31 @@ test-misc: install
-
- # Test memory leaks.
- test-memleaks: install
- +=======
++ # Run all tests.
++-test: install
++test:
- + $(PYTHON) $(TSCRIPT)
- +
++ $(PYTHON) $(TSCRIPT)
++
++ # Test psutil process-related APIs.
++-test-process: install
++test-process:
- + $(PYTHON) -m unittest -v psutil.tests.test_process
- +
++ $(PYTHON) -m unittest -v psutil.tests.test_process
++
++ # Test psutil system-related APIs.
++-test-system: install
++test-system:
- + $(PYTHON) -m unittest -v psutil.tests.test_system
- +
++ $(PYTHON) -m unittest -v psutil.tests.test_system
++
++ # Test misc.
++-test-misc: install
+++test-misc:
++ $(PYTHON) psutil/tests/test_misc.py
++
++ # Test POSIX.
++-test-posix: install
+++test-posix:
++ $(PYTHON) psutil/tests/test_posix.py
++
++ # Test memory leaks.
++-test-memleaks: install
++test-memleaks:
+ $(PYTHON) psutil/tests/test_memory_leaks.py
+
+ # Run specific platform tests only.
+-test-platform: install
++test-platform:
+ $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS") if getattr(psutil, x)][0])'`.py
+
- # Run a specific test by name; e.g. "make test-by-name disk_" will run
- # all test methods containing "disk_" in their name.
- # Requires "pip install nose".
++ # Run a specific test by name, e.g.
++ # make test-by-name psutil.tests.test_system.TestSystemAPIs.test_cpu_times
+-test-by-name: install
++test-by-name:
- @$(PYTHON) -m nose psutil/tests/*.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
-
- # Same as above but for test_memory_leaks.py script.
- -test-memleaks-by-name: install
- +test-memleaks-by-name:
- @$(PYTHON) -m nose test/test_memory_leaks.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
++ @$(PYTHON) -m unittest -v $(ARGS)
+
+ coverage: install
diff --cc debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
index 256c16f,0000000..f12ff7e
mode 100644,000000..100644
--- a/debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
+++ b/debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
@@@ -1,86 -1,0 +1,66 @@@
- From d878eb36d1472bffbe7e633306250bf0bb577f3d Mon Sep 17 00:00:00 2001
++From 071c1a174f9e9f89d6048e9e377fd4a068e89dc6 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 | 34 ++++++++--------------------------
- 1 file changed, 8 insertions(+), 26 deletions(-)
++ Makefile | 17 +++++++++--------
++ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index e298e0a..7670cd5 100644
++index 29fc528..3b53ae8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@
++ # You can set the variables below from the command line.
+
- # You can set the following variables from the command line.
+ PYTHON = python
++PYTHONPATH = .
+ TSCRIPT = psutil/tests/runner.py
- INSTALL_OPTS =
++ ARGS =
+
- @@ -73,7 +74,6 @@ install: build
- uninstall:
- cd ..; $(PYTHON) -m pip uninstall -y -v psutil
-
- -<<<<<<< 59d1042fdd4f68524fc5f231281e35602d85d86e
- # Install PIP (only if necessary).
- install-pip:
- $(PYTHON) -c \
- @@ -108,49 +108,31 @@ setup-dev-env: install-git-hooks install-pip
- # ===================================================================
++@@ -117,36 +118,36 @@ setup-dev-env: install-git-hooks install-pip
+
+ # Run all tests.
- -test: install
- - $(PYTHON) $(TSCRIPT)
- -
- -# Test psutil process-related APIs.
- -test-process: install
- - $(PYTHON) -m unittest -v psutil.tests.test_process
- -
- -# Test psutil system-related APIs.
- -test-system: install
- - $(PYTHON) -m unittest -v psutil.tests.test_system
- -
- -# Test misc.
- -test-misc: install
- - $(PYTHON) psutil/tests/test_misc.py
- -
- -# Test memory leaks.
- -test-memleaks: install
- -=======
+ test:
+- $(PYTHON) $(TSCRIPT)
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
+
++ # Test psutil process-related APIs.
+ test-process:
+- $(PYTHON) -m unittest -v psutil.tests.test_process
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_process
+
++ # Test psutil system-related APIs.
+ test-system:
+- $(PYTHON) -m unittest -v psutil.tests.test_system
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_system
+
++ # Test misc.
++ test-misc:
++- $(PYTHON) psutil/tests/test_misc.py
+++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_misc.py
++
++ # Test POSIX.
++ test-posix:
++- $(PYTHON) psutil/tests/test_posix.py
+++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_posix.py
++
++ # Test memory leaks.
+ test-memleaks:
+- $(PYTHON) psutil/tests/test_memory_leaks.py
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_memory_leaks.py
+
+ # Run specific platform tests only.
+ test-platform:
+- $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS") if getattr(psutil, x)][0])'`.py
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS") if getattr(psutil, x)][0])'`.py
+
- # Run a specific test by name; e.g. "make test-by-name disk_" will run
- # all test methods containing "disk_" in their name.
- # Requires "pip install nose".
++ # Run a specific test by name, e.g.
++ # make test-by-name psutil.tests.test_system.TestSystemAPIs.test_cpu_times
+ test-by-name:
- - @$(PYTHON) -m nose psutil/tests/*.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
- + @PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m nose psutil/tests/*.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
-
- # Same as above but for test_memory_leaks.py script.
- test-memleaks-by-name:
- - @$(PYTHON) -m nose test/test_memory_leaks.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
- + @PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m nose test/test_memory_leaks.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
++- @$(PYTHON) -m unittest -v $(ARGS)
+++ PYTHONPATH=$(PYTHONPATH) @$(PYTHON) -m unittest -v $(ARGS)
+
+ coverage: install
+ # Note: coverage options are controlled by .coveragerc file
diff --cc debian/patches/remove-google-analytics.patch
index 1e7b4f9,0000000..bd185b1
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 ac9ce3f33ab0a59b3a85c33b6485dff392e88eaa Mon Sep 17 00:00:00 2001
++From bb3e54b3ae576c8e3d3c344c23eb0392e83f5b80 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