[Python-modules-commits] [python-psutil] 12/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 492a32c5157a5d31deb5e56c844c78a69be689de
Merge: b2da839 649ad42
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 10 15:05:40 2016 +0100

    merge patched into master

 Makefile                                               | 14 +++++++-------
 debian/.git-dpm                                        |  4 ++--
 .../0003-pass-PYTHONPATH-to-the-test-runner.patch      | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index b514e42,0000000..6bf291d
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
- f61f462bf784cadb77d195115b278e939a45c610
- f61f462bf784cadb77d195115b278e939a45c610
++649ad42d5eaeb0e8233088446443d8e7db17d615
++649ad42d5eaeb0e8233088446443d8e7db17d615
 +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 a5b72c3,0000000..f19a920
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 f61f462bf784cadb77d195115b278e939a45c610 Mon Sep 17 00:00:00 2001
++From 649ad42d5eaeb0e8233088446443d8e7db17d615 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
++index a9ade20..ef37570 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)
+++	PYTHONPATH=$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
 + 
 + test-process:
 +-	$(PYTHON) -m unittest -v psutil.tests.test_process
- +	$(PYTHONPATH) $(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) $(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) $(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) $(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) $(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) $(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

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