[arch-commits] Commit in python-psutil/trunk (2 files)

[Jelle van der Waa]

    Date: Tuesday, March 12, 2019 @ 21:28:11
  Author: jelle
Revision: 440762

upgpkg: python-psutil 5.6.0-1

Upstream update.

Modified:
  python-psutil/trunk/PKGBUILD
Deleted:
  python-psutil/trunk/fix_test_disk_io_counters_sysfs.patch

---------------------------------------+
 PKGBUILD                              |    4 ++--
 fix_test_disk_io_counters_sysfs.patch |   20 --------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-12 21:14:31 UTC (rev 440761)
+++ PKGBUILD	2019-03-12 21:28:11 UTC (rev 440762)
@@ -2,7 +2,7 @@
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=5.5.0
+pkgver=5.6.0
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/giampaolo/psutil'
@@ -10,7 +10,7 @@
 makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
 checkdepends=('net-tools' 'procps-ng' 'python2-ipaddress' 'python2-mock' 'python-mock' 'python-pytest')
 source=("https://github.com/giampaolo/psutil/archive/release-$pkgver.tar.gz")
-sha512sums=('40f72a83523be192062a2b22fdc14bef80ee4719af88bfadfac5b535d1303fb0fc06ec61062a7d2cfacc94f262d317d8cab4ddb68bd333670d059742d0414a00')
+sha512sums=('6b28da384c66817c588cbc390b2de96076dfe378a3bbb08de556eaf37f6050a43b6411269d002f538639b34d0df0e386445780507fdd484fc20b3d9d3e249d26')
 
 build() {
   cd psutil-release-$pkgver

Deleted: fix_test_disk_io_counters_sysfs.patch
===================================================================
--- fix_test_disk_io_counters_sysfs.patch	2019-03-12 21:14:31 UTC (rev 440761)
+++ fix_test_disk_io_counters_sysfs.patch	2019-03-12 21:28:11 UTC (rev 440762)
@@ -1,20 +0,0 @@
-diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
-index b775d39a..dcacfea0 100644
---- a/psutil/_pslinux.py
-+++ b/psutil/_pslinux.py
-@@ -1099,8 +1099,13 @@ def disk_io_counters(perdisk=False):
-                 with open_text(os.path.join(root, 'stat')) as f:
-                     fields = f.read().strip().split()
-                 name = os.path.basename(root)
--                (reads, reads_merged, rbytes, rtime, writes, writes_merged,
--                    wbytes, wtime, _, busy_time, _) = map(int, fields)
-+                if len(fields) == 11:
-+                    (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-+                     wbytes, wtime, _, busy_time, _) = map(int, fields)
-+                else:
-+                    (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-+                     wbytes, wtime, _, busy_time, _, _, _, _, _) = map(int,
-+                                                                       fields)
-                 yield (name, reads, writes, rbytes, wbytes, rtime,
-                        wtime, reads_merged, writes_merged, busy_time)
-