[Python-modules-commits] [python-psutil] 10/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 b2da83926a638d33defe4274364492a8a72ae427
Merge: 7920178 f61f462
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 10 13:17:50 2016 +0100

    merge patched into master

 Makefile                                           | 15 +++---
 debian/.git-dpm                                    |  4 +-
 .../0003-pass-PYTHONPATH-to-the-test-runner.patch  | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 70 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 5527219,0000000..b514e42
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
- f02301796cb835a0f45c5e17c7333b8c782eaa55
- f02301796cb835a0f45c5e17c7333b8c782eaa55
++f61f462bf784cadb77d195115b278e939a45c610
++f61f462bf784cadb77d195115b278e939a45c610
 +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/0003-pass-PYTHONPATH-to-the-test-runner.patch
index 0000000,0000000..a5b72c3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
@@@ -1,0 -1,0 +1,59 @@@
++From f61f462bf784cadb77d195115b278e939a45c610 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..ea5d366 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:
++ 	cd ..; $(PYTHON) -m pip uninstall -y -v psutil
++ 
++ test:
++-	$(PYTHON) $(TSCRIPT)
+++	$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
++ 
++ test-process:
++-	$(PYTHON) -m unittest -v psutil.tests.test_process
+++	$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_process
++ 
++ test-system:
++-	$(PYTHON) -m unittest -v psutil.tests.test_system
+++	$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_system
++ 
++ test-memleaks:
++-	$(PYTHON) psutil/tests/test_memory_leaks.py
+++	$(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) $(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) $(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) $(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/series
index 86b9d12,0000000..b5c35d4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +remove-google-analytics.patch
 +0002-dont-depend-on-install-when-running-tests.patch
++0003-pass-PYTHONPATH-to-the-test-runner.patch

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