[Python-modules-commits] [python-psutil] 08/16: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository python-psutil.

commit 792017885042e8d7cd46efd7dc2f655b198c70a3
Merge: ae7b343 f023017
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 10 13:13:49 2016 +0100

    merge patched into master

 Makefile                                           | 14 +++---
 debian/.git-dpm                                    |  4 +-
 ...dont-depend-on-install-when-running-tests.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index c686618,0000000..5527219
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
- 5aad5293235e33f0254dc1472b0e52310ffcc53f
- 5aad5293235e33f0254dc1472b0e52310ffcc53f
++f02301796cb835a0f45c5e17c7333b8c782eaa55
++f02301796cb835a0f45c5e17c7333b8c782eaa55
 +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/0002-dont-depend-on-install-when-running-tests.patch
index 0000000,0000000..9b0c526
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-dont-depend-on-install-when-running-tests.patch
@@@ -1,0 -1,0 +1,51 @@@
++From f02301796cb835a0f45c5e17c7333b8c782eaa55 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
++--- a/Makefile
+++++ b/Makefile
++@@ -62,30 +62,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/series
index b3b4612,0000000..86b9d12
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +remove-google-analytics.patch
++0002-dont-depend-on-install-when-running-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-psutil.git