[Python-modules-commits] [python-psutil] 06/08: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Oct 2 20:03: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 4499279bdf7d1a065ad5db9a846183fd63771805
Merge: cc4af18 d878eb3
Author: Sandro Tosi <morph at debian.org>
Date: Sun Oct 2 15:44:57 2016 -0400
merge patched into master
.ci/appveyor/download_exes.py | 10 +-
CREDITS | 8 +
DEVGUIDE.rst | 11 +-
HISTORY.rst | 23 +++
INSTALL.rst | 72 ++++++---
Makefile | 164 ++++++++++++++-------
PKG-INFO | 32 +---
README.rst | 28 +---
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 45 +++---
.../0003-pass-PYTHONPATH-to-the-test-runner.patch | 57 +++++--
debian/patches/remove-google-analytics.patch | 2 +-
docs/Makefile | 8 +-
docs/index.rst | 10 +-
psutil.egg-info/PKG-INFO | 32 +---
psutil.egg-info/SOURCES.txt | 6 -
psutil/__init__.py | 40 +++--
psutil/_common.py | 19 +--
psutil/_pslinux.py | 2 +-
psutil/_pssunos.py | 40 ++++-
psutil/_psutil_bsd.c | 1 -
psutil/_psutil_bsd.h | 36 -----
psutil/_psutil_linux.c | 2 -
psutil/_psutil_linux.h | 21 ---
psutil/_psutil_osx.c | 1 -
psutil/_psutil_osx.h | 43 ------
psutil/_psutil_posix.c | 2 +-
psutil/_psutil_sunos.c | 4 +-
psutil/_psutil_sunos.h | 28 ----
psutil/_psutil_windows.c | 54 +++++--
psutil/_psutil_windows.h | 70 ---------
psutil/_pswindows.py | 8 +-
psutil/arch/windows/process_info.c | 2 +
psutil/arch/windows/services.c | 72 +++++++--
psutil/tests/__init__.py | 80 ++++++----
psutil/tests/test_process.py | 122 +++++++--------
psutil/tests/test_testutils.py | 51 -------
37 files changed, 602 insertions(+), 610 deletions(-)
diff --cc debian/.git-dpm
index 4618210,0000000..192c108
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
- ef1e60bae013d185212fb8c2881842fe4f9c8ca4
- ef1e60bae013d185212fb8c2881842fe4f9c8ca4
- 52757aa8b970726b8324740bca3a8ee00a58992c
++d878eb36d1472bffbe7e633306250bf0bb577f3d
++d878eb36d1472bffbe7e633306250bf0bb577f3d
++59d1042fdd4f68524fc5f231281e35602d85d86e
+59d1042fdd4f68524fc5f231281e35602d85d86e
+python-psutil_4.3.1.orig.tar.gz
+14fd78406eed9b0cd794cfad19f8d49eb76d1c44
+315878
+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 634f9cb,0000000..8fa3c0c
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,56 @@@
- From b759c9b3830a1a508f2d367d6f4e005da2ca0803 Mon Sep 17 00:00:00 2001
++From 0b963d7f27305028e9578ddb63fac7dbe4638152 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(-)
++ Makefile | 18 +++++++++++++++---
++ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index a20f6a8..73e1403 100644
++index b8c118f..e298e0a 100644
+--- a/Makefile
++++ b/Makefile
- @@ -63,30 +63,30 @@ install: build
++@@ -73,6 +73,7 @@ install: build
+ uninstall:
+ cd ..; $(PYTHON) -m pip uninstall -y -v psutil
+
- -test: install
- +test:
- $(PYTHON) $(TSCRIPT)
+++<<<<<<< 59d1042fdd4f68524fc5f231281e35602d85d86e
++ # Install PIP (only if necessary).
++ install-pip:
++ $(PYTHON) -c \
++@@ -124,20 +125,31 @@ test-misc: install
+
- -test-process: install
++ # Test memory leaks.
++ test-memleaks: install
+++=======
+++test:
+++ $(PYTHON) $(TSCRIPT)
+++
++test-process:
- $(PYTHON) -m unittest -v psutil.tests.test_process
-
- -test-system: install
+++ $(PYTHON) -m unittest -v psutil.tests.test_process
+++
++test-system:
- $(PYTHON) -m unittest -v psutil.tests.test_system
-
- -test-memleaks: install
+++ $(PYTHON) -m unittest -v psutil.tests.test_system
+++
++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".
+-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 d05242e,0000000..256c16f
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,86 @@@
- From ef1e60bae013d185212fb8c2881842fe4f9c8ca4 Mon Sep 17 00:00:00 2001
++From d878eb36d1472bffbe7e633306250bf0bb577f3d 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(-)
++ Makefile | 34 ++++++++--------------------------
++ 1 file changed, 8 insertions(+), 26 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index 73e1403..44762e1 100644
++index e298e0a..7670cd5 100644
+--- a/Makefile
++++ b/Makefile
- @@ -4,6 +4,7 @@
++@@ -3,6 +3,7 @@
+
- # You can set these variables from the command line.
- PYTHON = python
++ # You can set the following variables from the command line.
++ PYTHON = python
++PYTHONPATH = .
- TSCRIPT = psutil/tests/runner.py
++ TSCRIPT = psutil/tests/runner.py
++ INSTALL_OPTS =
+
- all: test
- @@ -64,30 +65,30 @@ uninstall:
++@@ -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
++ # ===================================================================
++
++ # 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-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 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".
+ 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 c8addb2,0000000..1e7b4f9
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 ed8f9671306270679e10e0d960e7a42bbf92553f Mon Sep 17 00:00:00 2001
++From ac9ce3f33ab0a59b3a85c33b6485dff392e88eaa 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