Date: Tuesday, March 12, 2019 @ 21:28:23 Author: jelle Revision: 440763
archrelease: copy trunk to community-x86_64 Added: python-psutil/repos/community-x86_64/PKGBUILD (from rev 440762, python-psutil/trunk/PKGBUILD) Deleted: python-psutil/repos/community-x86_64/PKGBUILD python-psutil/repos/community-x86_64/fix_test_disk_io_counters_sysfs.patch ---------------------------------------+ PKGBUILD | 112 ++++++++++++++++---------------- fix_test_disk_io_counters_sysfs.patch | 20 ----- 2 files changed, 56 insertions(+), 76 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-12 21:28:11 UTC (rev 440762) +++ PKGBUILD 2019-03-12 21:28:23 UTC (rev 440763) @@ -1,56 +0,0 @@ -# Maintainer: Sébastien Luttringer - -pkgbase=python-psutil -pkgname=('python-psutil' 'python2-psutil') -pkgver=5.5.0 -pkgrel=1 -arch=('x86_64') -url='https://github.com/giampaolo/psutil' -license=('custom: BSD') -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') - -build() { - cd psutil-release-$pkgver - - python setup.py build --build-lib=build/python - - python2 setup.py build --build-lib=build/python2 - find build/python2 -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; -} - -check() { - cd psutil-release-$pkgver - - # Required for testing - cp setup.py build/python - cp -r scripts build/python/ - -# 4 non-working tests in build chroot, requires fixes. Test framework does not allow exclusion. -# PYTHONPATH="$PWD/build/python" python psutil/tests/__main__.py -} - -package_python-psutil() { - pkgdesc='A cross-platform process and system utilities module for Python' - depends=('python') - - cd psutil-release-$pkgver - python setup.py build --build-lib=build/python \ - install --root="$pkgdir" --optimize=1 - install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE -} - -package_python2-psutil() { - pkgdesc='A cross-platform process and system utilities module for Python2' - depends=('python2') - - cd psutil-release-$pkgver - python2 setup.py build --build-lib=build/python2 \ - install --root="$pkgdir" --optimize=1 - install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 et: Copied: python-psutil/repos/community-x86_64/PKGBUILD (from rev 440762, python-psutil/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-12 21:28:23 UTC (rev 440763) @@ -0,0 +1,56 @@ +# Maintainer: Sébastien Luttringer + +pkgbase=python-psutil +pkgname=('python-psutil' 'python2-psutil') +pkgver=5.6.0 +pkgrel=1 +arch=('x86_64') +url='https://github.com/giampaolo/psutil' +license=('custom: BSD') +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=('6b28da384c66817c588cbc390b2de96076dfe378a3bbb08de556eaf37f6050a43b6411269d002f538639b34d0df0e386445780507fdd484fc20b3d9d3e249d26') + +build() { + cd psutil-release-$pkgver + + python setup.py build --build-lib=build/python + + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +check() { + cd psutil-release-$pkgver + + # Required for testing + cp setup.py build/python + cp -r scripts build/python/ + +# 4 non-working tests in build chroot, requires fixes. Test framework does not allow exclusion. +# PYTHONPATH="$PWD/build/python" python psutil/tests/__main__.py +} + +package_python-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python' + depends=('python') + + cd psutil-release-$pkgver + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +package_python2-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python2' + depends=('python2') + + cd psutil-release-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Deleted: fix_test_disk_io_counters_sysfs.patch =================================================================== --- fix_test_disk_io_counters_sysfs.patch 2019-03-12 21:28:11 UTC (rev 440762) +++ fix_test_disk_io_counters_sysfs.patch 2019-03-12 21:28:23 UTC (rev 440763) @@ -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) -