From 4988407241e6f933a05f060d32a9f7b2eb25b478 Mon Sep 17 00:00:00 2001 From: graysky Date: Fri, 3 Dec 2021 17:05:44 -0500 Subject: [PATCH] aur/stressberry to 0.3.3-3 Fix via patch not hacky sed and re-enable check function --- aur/stressberry/PKGBUILD | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/aur/stressberry/PKGBUILD b/aur/stressberry/PKGBUILD index e7bbac051..5072e44b7 100644 --- a/aur/stressberry/PKGBUILD +++ b/aur/stressberry/PKGBUILD @@ -3,28 +3,35 @@ pkgname=stressberry pkgver=0.3.3 -pkgrel=2 +pkgrel=3 pkgdesc='Stress tests and temperature plots for the Raspberry Pi' arch=(any) url='https://github.com/nschloe/stressberry' license=(GPL3) depends=(python-matplotlib python-yaml python-matplotx stress) makedepends=(python-pytest python-setuptools python-build python-install python-wheel) -source=("$pkgname-$pkgver.tar.gz::https://github.com/nschloe/$pkgname/archive/v$pkgver.tar.gz") -b2sums=('3ebdcc0f0a951b9a0c8a5a35d96cda2edc535b58f08abeb3eefb281a7bb6c582e66e9eb601acce6c79ad92320c0b97ef481d2e76ffa97ae7e7033a5a7e9c38a3') +source=("$pkgname-$pkgver.tar.gz::https://github.com/nschloe/$pkgname/archive/v$pkgver.tar.gz" +0001-convert-to-matplotx-from-dufte.patch::https://github.com/graysky2/stressberry/commit/4e8e9b37866faca686210ba7724a3c285c54e759.patch) +b2sums=('3ebdcc0f0a951b9a0c8a5a35d96cda2edc535b58f08abeb3eefb281a7bb6c582e66e9eb601acce6c79ad92320c0b97ef481d2e76ffa97ae7e7033a5a7e9c38a3' + '0e8c426a55642b773a9ee1fe76a948bbaf17c24a88995a400e91d56638f2df32837d6e5aa56cfaba28af51636e24f598d3a3565d4f519f33bed2f91de75415d5') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-convert-to-matplotx-from-dufte.patch +} build() { cd $pkgname-$pkgver python -m build --wheel --skip-dependency-check --no-isolation } -#check() { -# cd $pkgname-$pkgver -# mkdir -p temp -# local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") -# python -m install --optimize=1 --destdir=temp dist/*.whl -# PATH="$PWD/temp/usr/bin:$PATH" PYTHONPATH="$PWD/temp/$site_packages" python -m pytest -#} +check() { + cd $pkgname-$pkgver + mkdir -p temp + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + python -m install --optimize=1 --destdir=temp dist/*.whl + PATH="$PWD/temp/usr/bin:$PATH" PYTHONPATH="$PWD/temp/$site_packages" python -m pytest +} package() { cd $pkgname-$pkgver @@ -39,10 +46,4 @@ package() { chmod +x "$pkgdir"/usr/bin/stressberry-plot chmod +x "$pkgdir"/usr/bin/stressberry-run - - # hacky fix https://github.com/nschloe/stressberry/issues/118 - sed -i -e '/import dufte/ s,dufte,matplotx,' \ - -i -e '/plt.style.use/ s,dufte.style,matplotx.styles.dufte,' \ - -i -e '/dufte.legend/ s,dufte,plt,' \ - "$pkgdir/$site_packages"/stressberry/cli/plot.py }