[Python-modules-commits] [python-psutil] 06/09: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sat Jun 11 20:17:29 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 4781293bae24badc684d34187ec401f908320a16
Merge: 594aec6 ef1e60b
Author: Sandro Tosi <morph at debian.org>
Date: Sat Jun 11 21:06:25 2016 +0100
merge patched into master
.ci/appveyor/download_exes.py | 92 +++++
.ci/appveyor/run_with_compiler.cmd | 71 +++-
DEVGUIDE.rst | 12 +
HISTORY.rst | 21 +
IDEAS | 18 +-
INSTALL.rst | 4 +-
Makefile | 9 +
PKG-INFO | 29 +-
README.rst | 27 +-
appveyor.yml | 26 +-
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 6 +-
.../0003-pass-PYTHONPATH-to-the-test-runner.patch | 6 +-
debian/patches/remove-google-analytics.patch | 2 +-
docs/index.rst | 79 +++-
make.bat | 7 +
psutil.egg-info/PKG-INFO | 29 +-
psutil.egg-info/SOURCES.txt | 6 +-
psutil/__init__.py | 39 +-
psutil/_common.py | 2 +-
psutil/_psbsd.py | 3 +-
psutil/_pslinux.py | 197 +++++-----
psutil/_psosx.py | 3 +-
psutil/_pssunos.py | 4 +-
psutil/_psutil_linux.c | 7 +-
psutil/_psutil_windows.c | 43 +-
psutil/_pswindows.py | 201 +++++++++-
psutil/arch/windows/services.c | 431 +++++++++++++++++++++
psutil/arch/windows/services.h | 17 +
psutil/tests/__init__.py | 2 +-
psutil/tests/test_linux.py | 104 +++--
psutil/tests/test_memory_leaks.py | 23 +-
psutil/tests/test_misc.py | 10 +
psutil/tests/test_osx.py | 2 +-
psutil/tests/test_windows.py | 89 ++++-
scripts/winservices.py | 56 +++
setup.py | 1 +
37 files changed, 1473 insertions(+), 211 deletions(-)
diff --cc debian/.git-dpm
index fcf5e09,0000000..b4e84da
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
- 649ad42d5eaeb0e8233088446443d8e7db17d615
- 649ad42d5eaeb0e8233088446443d8e7db17d615
- 2c309ebac47893e498f97c81dde0e61ce8f7c4a5
++ef1e60bae013d185212fb8c2881842fe4f9c8ca4
++ef1e60bae013d185212fb8c2881842fe4f9c8ca4
++52757aa8b970726b8324740bca3a8ee00a58992c
+52757aa8b970726b8324740bca3a8ee00a58992c
+python-psutil_4.2.0.orig.tar.gz
+2c2c21b23446a38b0d9b95f3126e16352279e900
+311767
+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 9b0c526,0000000..634f9cb
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,51 -1,0 +1,51 @@@
- From f02301796cb835a0f45c5e17c7333b8c782eaa55 Mon Sep 17 00:00:00 2001
++From b759c9b3830a1a508f2d367d6f4e005da2ca0803 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 | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index 3e6995d..a9ade20 100644
++index a20f6a8..73e1403 100644
+--- a/Makefile
++++ b/Makefile
- @@ -62,30 +62,30 @@ install: build
++@@ -63,30 +63,30 @@ install: build
+ uninstall:
+ cd ..; $(PYTHON) -m pip uninstall -y -v psutil
+
+-test: install
++test:
+ $(PYTHON) $(TSCRIPT)
+
+-test-process: install
++test-process:
+ $(PYTHON) -m unittest -v psutil.tests.test_process
+
+-test-system: install
++test-system:
+ $(PYTHON) -m unittest -v psutil.tests.test_system
+
+-test-memleaks: install
++test-memleaks:
+ $(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.
+ # Requires "pip install nose".
+-test-by-name: install
++test-by-name:
+ @$(PYTHON) -m nose psutil/tests/*.py --nocapture -v -m $(filter-out $@,$(MAKECMDGOALS))
+
+ # 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
+
+ # 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))
+
+ coverage: install
diff --cc debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
index f19a920,0000000..d05242e
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,59 -1,0 +1,59 @@@
- From 649ad42d5eaeb0e8233088446443d8e7db17d615 Mon Sep 17 00:00:00 2001
++From ef1e60bae013d185212fb8c2881842fe4f9c8ca4 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 | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index a9ade20..ef37570 100644
++index 73e1403..44762e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,7 @@
+
+ # You can set these variables from the command line.
+ PYTHON = python
++PYTHONPATH = .
+ TSCRIPT = psutil/tests/runner.py
+
+ all: test
- @@ -63,30 +64,30 @@ uninstall:
++@@ -64,30 +65,30 @@ uninstall:
+ cd ..; $(PYTHON) -m pip uninstall -y -v psutil
+
+ test:
+- $(PYTHON) $(TSCRIPT)
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
+
+ test-process:
+- $(PYTHON) -m unittest -v psutil.tests.test_process
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_process
+
+ test-system:
+- $(PYTHON) -m unittest -v psutil.tests.test_system
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_system
+
+ test-memleaks:
+- $(PYTHON) psutil/tests/test_memory_leaks.py
++ 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.
+ # Requires "pip install nose".
+ 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))
+
+ # 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
+
+ # 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))
+
+ coverage: install
+ # Note: coverage options are controlled by .coveragerc file
diff --cc debian/patches/remove-google-analytics.patch
index 8c6b548,0000000..c8addb2
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 5aad5293235e33f0254dc1472b0e52310ffcc53f Mon Sep 17 00:00:00 2001
++From ed8f9671306270679e10e0d960e7a42bbf92553f 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