[PR PATCH] dstat: patch to silence collections warnings

[PR PATCH] dstat: patch to silence collections warnings

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages dstat
https://github.com/void-linux/void-packages/pull/28528

dstat: patch to silence collections warnings
Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28528.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dstat-28528.patch --]
[-- Type: text/x-diff, Size: 1584 bytes --]

From ce5567f9d64628180512735c84ffa35f666f6961 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 5 Feb 2021 08:56:24 -0800
Subject: [PATCH] dstat: patch to silence collections warnings

Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.
---
 srcpkgs/dstat/patches/dstat.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/dstat/patches/dstat.patch

diff --git a/srcpkgs/dstat/patches/dstat.patch b/srcpkgs/dstat/patches/dstat.patch
new file mode 100644
index 00000000000..4866b024755
--- /dev/null
+++ b/srcpkgs/dstat/patches/dstat.patch
@@ -0,0 +1,20 @@
+--- dstat.orig  2020-11-21 17:50:21.000000000 -0800
++++ dstat       2021-02-04 22:50:28.970723977 -0800
+@@ -19,7 +19,7 @@
+ from __future__ import absolute_import, division, generators, print_function
+ __metaclass__ = type
+ 
+-import collections
++import collections.abc
+ import fnmatch
+ import getopt
+ import getpass
+@@ -512,7 +512,7 @@
+                 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], collections.abc.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):

Re: dstat: patch to silence collections warnings

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28528#issuecomment-774169120

Comment:
You want to revbump it ;)

Re: dstat: patch to silence collections warnings

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28528#issuecomment-774169475

Comment:
Or maybe not, it will be rebuilt with the patch when a new python version lands. Only revbump if you want to silence the warnings now, I guess.

Re: dstat: patch to silence collections warnings

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28528#issuecomment-774184415

Comment:
Good call. One sec...

Re: [PR PATCH] [Updated] dstat: patch to silence collections warnings

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages dstat
https://github.com/void-linux/void-packages/pull/28528

dstat: patch to silence collections warnings
Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28528.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dstat-28528.patch --]
[-- Type: text/x-diff, Size: 2016 bytes --]

From 27ed34e3e49039788d1565f2b33bd9406b08c918 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 5 Feb 2021 08:56:24 -0800
Subject: [PATCH] dstat: patch to silence collections warnings

Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.
---
 srcpkgs/dstat/patches/dstat.patch | 20 ++++++++++++++++++++
 srcpkgs/dstat/template            |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dstat/patches/dstat.patch

diff --git a/srcpkgs/dstat/patches/dstat.patch b/srcpkgs/dstat/patches/dstat.patch
new file mode 100644
index 00000000000..4866b024755
--- /dev/null
+++ b/srcpkgs/dstat/patches/dstat.patch
@@ -0,0 +1,20 @@
+--- dstat.orig  2020-11-21 17:50:21.000000000 -0800
++++ dstat       2021-02-04 22:50:28.970723977 -0800
+@@ -19,7 +19,7 @@
+ from __future__ import absolute_import, division, generators, print_function
+ __metaclass__ = type
+ 
+-import collections
++import collections.abc
+ import fnmatch
+ import getopt
+ import getpass
+@@ -512,7 +512,7 @@
+                 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], collections.abc.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):
diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template
index 43a7efd6ded..9e9d9d3217a 100644
--- a/srcpkgs/dstat/template
+++ b/srcpkgs/dstat/template
@@ -1,7 +1,7 @@
 # Template file for 'dstat'
 pkgname=dstat
 version=0.7.4
-revision=3
+revision=4
 makedepends="python3"
 depends="python3-six"
 short_desc="Versatile tool for generating system resource statistics"

Re: dstat: patch to silence collections warnings

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28528#issuecomment-774196636

Comment:
@leahneukirchen 

Re: [PR PATCH] [Merged]: dstat: patch to silence collections warnings

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There's a merged pull request on the void-packages repository

dstat: patch to silence collections warnings
https://github.com/void-linux/void-packages/pull/28528

Description:
Development on dstat is dead so whenever Python makes good on their
threat of removing direct access to collections.Sequence it will fail.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->