[Python-modules-commits] [python-psutil] 09/14: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sun Nov 26 01:56:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository python-psutil.
commit f42eca614de9d7c5f2f6294b8d5f21fb0990679a
Merge: d4319e5 af75554
Author: Sandro Tosi <morph at debian.org>
Date: Sat Nov 25 18:08:23 2017 -0500
merge patched into master
Makefile | 1 -
debian/.git-dpm | 4 ++--
debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch | 12 +++++-------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --cc debian/.git-dpm
index a0a7de2,0000000..adc5b32
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
- ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3
- ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3
++af75554b4f7a1a27b812613c29bc65c205d5d995
++af75554b4f7a1a27b812613c29bc65c205d5d995
+0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
+0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
+python-psutil_5.4.1.orig.tar.gz
+6305bc320d7b9d37967e5e004e2404beefa71a34
+408489
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
index c6b3f1e,0000000..e105d89
mode 100644,000000..100644
--- a/debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
+++ b/debian/patches/0002-pass-PYTHONPATH-to-the-test-runner.patch
@@@ -1,78 -1,0 +1,76 @@@
- From ca91fc96536c0032c8b3f5e253f9a61da4d1e9f3 Mon Sep 17 00:00:00 2001
++From af75554b4f7a1a27b812613c29bc65c205d5d995 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 | 26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
++ Makefile | 25 +++++++++++++------------
++ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index 0529894..43edc7c 100644
++index 0529894..ac6ce40 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@
+ # You can set the variables below from the command line.
+
+ PYTHON = python
++PYTHONPATH = .
+ TSCRIPT = psutil/tests/__main__.py
+ ARGS =
+ # List of nice-to-have dev libs.
- @@ -106,43 +107,44 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
- # Tests
++@@ -107,42 +108,42 @@ setup-dev-env: ## Install GIT hooks, pip, test deps (also upgrades them).
+ # ===================================================================
+
- +<<<<<<< 0d4af096fd8048c3f00a8c6392b35a4daf8c4edb
+ test: ## Run all tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) $(TSCRIPT)
+
+ test-process: ## Run process-related API tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_process
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_process
+
+ test-system: ## Run system-related API tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_system
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v psutil.tests.test_system
+
+ test-misc: ## Run miscellaneous tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_misc.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_misc.py
+
+ test-unicode: ## Test APIs dealing with strings.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_unicode.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_unicode.py
+
+ test-contracts: ## APIs sanity tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_contracts.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_contracts.py
+
+ test-connections: ## Test net_connections() and Process.connections().
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_connections.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_connections.py
+
+ test-posix: ## POSIX specific tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_posix.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_posix.py
+
+ test-platform: ## Run specific platform tests only.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
+
+ test-memleaks: ## Memory leak tests.
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_memory_leaks.py
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) psutil/tests/test_memory_leaks.py
+
+ test-by-name: ## e.g. make test-by-name ARGS=psutil.tests.test_system.TestSystemAPIs
+- @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v $(ARGS)
++ PYTHONPATH=$(PYTHONPATH) @PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m unittest -v $(ARGS)
+
+ test-coverage: ## Run test coverage.
+ # Note: coverage options are controlled by .coveragerc file
+ rm -rf .coverage htmlcov
+- PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m coverage run $(TSCRIPT)
++ PYTHONPATH=$(PYTHONPATH) PSUTIL_TESTING=1 PYTHONWARNINGS=all $(PYTHON) -m coverage run $(TSCRIPT)
+ $(PYTHON) -m coverage report
+ @echo "writing results to htmlcov/index.html"
+ $(PYTHON) -m coverage html
--
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