diff options
| author |   Paul Healy <lmiphay@gmail.com> | 2019-10-08 21:21:11 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2019-10-21 17:08:17 +0300 |
| commit | 3b58c3821d247318956da534ca95b838d1ed26f2 (patch) | |
| tree | 11ac3922c454c63a40358d3b54f1827cf491a8e7 /sys-apps/dstat/files | |
| parent | mail-client/bower: removed obsolete ebuild (diff) | |
| download | gentoo-3b58c3821d247318956da534ca95b838d1ed26f2.tar.gz gentoo-3b58c3821d247318956da534ca95b838d1ed26f2.tar.bz2 gentoo-3b58c3821d247318956da534ca95b838d1ed26f2.zip | |
sys-apps/dstat: version bump to 0.7.4
Adds support for python 3
Now uses EAPI 7
backport fix from: https://github.com/dagwieers/dstat/pull/167/files
added missing six dep
avoid deprecation warning for importing collections with python 3.7
Closes: https://bugs.gentoo.org/696442
Signed-off-by: Paul Healy <lmiphay@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-apps/dstat/files')
| -rw-r--r-- | sys-apps/dstat/files/dstat-0.7.4-skip-non-sandbox-tests.patch | 18 | ||||
| -rw-r--r-- | sys-apps/dstat/files/fix-collections-deprecation-warning.patch | 25 |
2 files changed, 43 insertions, 0 deletions
diff --git a/sys-apps/dstat/files/dstat-0.7.4-skip-non-sandbox-tests.patch b/sys-apps/dstat/files/dstat-0.7.4-skip-non-sandbox-tests.patch new file mode 100644 index 000000000000..38457cdc95dc --- /dev/null +++ b/sys-apps/dstat/files/dstat-0.7.4-skip-non-sandbox-tests.patch @@ -0,0 +1,18 @@ +diff --git a/Makefile b/Makefile +index c371f62..42ef84d 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,10 +32,12 @@ clean: + rm -f examples/*.pyc plugins/*.pyc + $(MAKE) -C docs clean + ++TEST_PLUGINS=--cpufreq --disk-tps --dstat-cpu --dstat-ctxt --dstat-mem --dstat --helloworld --md-status --net-packets --proc-count --snooze --test --top-bio-adv --top-bio --top-childwait --top-cpu-adv --top-cpu --top-cputime-avg --top-cputime --top-int --top-io-adv --top-io --top-latency-avg --top-latency --top-mem --top-oom ++ + test: + ./dstat --version + ./dstat -taf 1 5 +- ./dstat -t --all-plugins 1 5 ++ ./dstat -t $(TEST_PLUGINS) 1 5 + + dist: clean + $(MAKE) -C docs dist diff --git a/sys-apps/dstat/files/fix-collections-deprecation-warning.patch b/sys-apps/dstat/files/fix-collections-deprecation-warning.patch new file mode 100644 index 000000000000..e505c98d89fa --- /dev/null +++ b/sys-apps/dstat/files/fix-collections-deprecation-warning.patch @@ -0,0 +1,25 @@ +diff --git a/dstat b/dstat +index 9359965..777242f 100755 +--- a/dstat ++++ b/dstat +@@ -19,6 +19,11 @@ + from __future__ import absolute_import, division, generators, print_function + __metaclass__ = type + ++try: ++ from collections.abc import Sequence ++except ImportError: ++ from collections import Sequence ++ + import collections + import fnmatch + import getopt +@@ -512,7 +517,7 @@ class dstat: + scale = self.scales[i] + else: + scale = self.scale +- if isinstance(self.val[name], collections.Sequence) and not isinstance(self.val[name], six.string_types): ++ if isinstance(self.val[name], Sequence) and not isinstance(self.val[name], six.string_types): + line = line + cprintlist(self.val[name], ctype, self.width, scale) + sep = theme['frame'] + char['colon'] + if i + 1 != len(self.vars): |