[Python-modules-commits] [python-psutil] 06/09: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Thu Jan 5 19:28:19 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 5e27d7868364cba8497fb9df12466553ee78f551
Merge: 45cceee 6db2aef
Author: Sandro Tosi <morph at debian.org>
Date: Thu Jan 5 14:12:27 2017 -0500
merge patched into master
.ci/README | 3 -
.ci/appveyor/README | 2 -
.ci/appveyor/install.ps1 | 85 -----
.ci/appveyor/run_with_compiler.cmd | 88 -----
.ci/travis/README | 2 -
.ci/travis/install.sh | 54 ----
.ci/travis/run.sh | 34 --
.git-pre-commit | 94 ------
.gitignore | 18 --
.travis.yml | 39 ---
CREDITS | 4 +
DEVGUIDE.rst | 6 +-
HISTORY.rst | 21 ++
IDEAS | 24 ++
MANIFEST.in | 31 +-
Makefile | 4 +
PKG-INFO | 55 +++-
README.rst | 53 ++-
appveyor.yml | 116 -------
debian/.git-dpm | 6 +-
...dont-depend-on-install-when-running-tests.patch | 6 +-
.../0003-pass-PYTHONPATH-to-the-test-runner.patch | 6 +-
debian/patches/remove-google-analytics.patch | 2 +-
docs/_static/copybutton.js | 57 ++++
docs/_static/sidebar.js | 161 ++++++++++
docs/_themes/pydoctheme/static/pydoctheme.css | 10 +
docs/conf.py | 3 +-
docs/index.rst | 357 +++++++++++++--------
psutil.egg-info/PKG-INFO | 55 +++-
psutil.egg-info/SOURCES.txt | 14 +-
psutil/__init__.py | 58 +++-
psutil/_psbsd.py | 22 +-
psutil/_psutil_bsd.c | 105 +++---
psutil/_psutil_posix.c | 69 ++--
psutil/_psutil_windows.c | 11 +-
psutil/_pswindows.py | 20 +-
psutil/arch/bsd/netbsd.c | 4 +-
psutil/arch/windows/ntextapi.h | 9 +-
psutil/tests/__init__.py | 4 +
psutil/tests/test_linux.py | 16 +
psutil/tests/test_misc.py | 5 +-
psutil/tests/test_posix.py | 4 +
psutil/tests/test_process.py | 4 +-
psutil/tests/test_system.py | 6 +-
scripts/internal/README | 2 -
scripts/internal/winmake.py | 3 +-
scripts/nettop.py | 1 +
scripts/procsmem.py | 2 +-
setup.py | 55 ++--
49 files changed, 900 insertions(+), 910 deletions(-)
diff --cc debian/.git-dpm
index 6287652,0000000..93f96f2
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
- 071c1a174f9e9f89d6048e9e377fd4a068e89dc6
- 071c1a174f9e9f89d6048e9e377fd4a068e89dc6
- 1e8831423569075965a2c16727ccd5b28f43a9dd
++6db2aef35611e3d5ce20915adf2870e1d4a4d1b6
++6db2aef35611e3d5ce20915adf2870e1d4a4d1b6
++8bc102f9570a371f178b15248492a84f0f47f570
+8bc102f9570a371f178b15248492a84f0f47f570
+python-psutil_5.0.1.orig.tar.gz
+103175218fb70ba68c39e9e8e7bc4529e225913d
+326693
+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 bebb15d,0000000..ed6bdeb
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,58 -1,0 +1,58 @@@
- From 8f5a6e6446ab23fba82bf5d178197d2892b06d4b Mon Sep 17 00:00:00 2001
++From 84e2d4f543768a1f34d626a4caa019b827200a9a 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 | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index c91d3b9..29fc528 100644
++index 13ed0c0..909d549 100644
+--- a/Makefile
++++ b/Makefile
- @@ -116,36 +116,36 @@ setup-dev-env: install-git-hooks install-pip
++@@ -117,36 +117,36 @@ setup-dev-env: install-git-hooks install-pip
+ # ===================================================================
+
+ # Run all tests.
+-test: install
++test:
+ $(PYTHON) $(TSCRIPT)
+
+ # Test psutil process-related APIs.
+-test-process: install
++test-process:
+ $(PYTHON) -m unittest -v psutil.tests.test_process
+
+ # Test psutil system-related APIs.
+-test-system: install
++test-system:
+ $(PYTHON) -m unittest -v psutil.tests.test_system
+
+ # Test misc.
+-test-misc: install
++test-misc:
+ $(PYTHON) psutil/tests/test_misc.py
+
+ # Test POSIX.
+-test-posix: install
++test-posix:
+ $(PYTHON) psutil/tests/test_posix.py
+
+ # Test memory leaks.
+-test-memleaks: install
++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 psutil.tests.test_system.TestSystemAPIs.test_cpu_times
+-test-by-name: install
++test-by-name:
+ @$(PYTHON) -m unittest -v $(ARGS)
+
+ coverage: install
diff --cc debian/patches/0003-pass-PYTHONPATH-to-the-test-runner.patch
index f12ff7e,0000000..801340f
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,66 -1,0 +1,66 @@@
- From 071c1a174f9e9f89d6048e9e377fd4a068e89dc6 Mon Sep 17 00:00:00 2001
++From 6db2aef35611e3d5ce20915adf2870e1d4a4d1b6 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 | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
- index 29fc528..3b53ae8 100644
++index 909d549..d6cc3e2 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/runner.py
+ ARGS =
+
- @@ -117,36 +118,36 @@ setup-dev-env: install-git-hooks install-pip
++@@ -118,36 +119,36 @@ setup-dev-env: install-git-hooks install-pip
+
+ # Run all tests.
+ test:
+- $(PYTHON) $(TSCRIPT)
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) $(TSCRIPT)
+
+ # Test psutil process-related APIs.
+ test-process:
+- $(PYTHON) -m unittest -v psutil.tests.test_process
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_process
+
+ # Test psutil system-related APIs.
+ test-system:
+- $(PYTHON) -m unittest -v psutil.tests.test_system
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) -m unittest -v psutil.tests.test_system
+
+ # Test misc.
+ test-misc:
+- $(PYTHON) psutil/tests/test_misc.py
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_misc.py
+
+ # Test POSIX.
+ test-posix:
+- $(PYTHON) psutil/tests/test_posix.py
++ PYTHONPATH=$(PYTHONPATH) $(PYTHON) psutil/tests/test_posix.py
+
+ # Test memory leaks.
+ 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 psutil.tests.test_system.TestSystemAPIs.test_cpu_times
+ test-by-name:
+- @$(PYTHON) -m unittest -v $(ARGS)
++ PYTHONPATH=$(PYTHONPATH) @$(PYTHON) -m unittest -v $(ARGS)
+
+ coverage: install
+ # Note: coverage options are controlled by .coveragerc file
diff --cc debian/patches/remove-google-analytics.patch
index bd185b1,0000000..e878715
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 bb3e54b3ae576c8e3d3c344c23eb0392e83f5b80 Mon Sep 17 00:00:00 2001
++From 1ad15607466c9b94397a0f8dfb1ae32d24ac3ed8 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