Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages / jrnl
Commits: 6f3ed145 by Carl Smedstad at 2024-08-27T11:57:25+02:00 upgpkg: 4.1-3: Replace python-pytest7 with standard pytest package The patched python-pytest-bdd-7.2.0-2 [0] fixes the incompatibility issues with pytest 8.1+. Other PKGBUILD changes: - Use SPDX license identifier. - Reformat PKGBUILD to one dependency per line. [0]: https://gitlab.archlinux.org/archlinux/packaging/packages/python-pytest-bdd/-/commit/296803881964a21e60e06fa16281c75e2586d445 - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,22 +1,23 @@ pkgbase = jrnl pkgdesc = Collect your thoughts and notes without leaving the command line pkgver = 4.1 - pkgrel = 2 + pkgrel = 3 url = https://jrnl.sh/ arch = any - license = GPL3 - checkdepends = python-pytest7 + license = GPL-3.0-or-later + checkdepends = python-pytest checkdepends = python-pytest-bdd checkdepends = python-pytest-xdist checkdepends = python-toml makedepends = python-build makedepends = python-installer makedepends = python-poetry-core + depends = python depends = python-colorama depends = python-cryptography + depends = python-dateutil depends = python-keyring depends = python-parsedatetime - depends = python-dateutil depends = python-pyxdg depends = python-rich depends = python-ruamel-yaml ===================================== PKGBUILD ===================================== @@ -2,15 +2,34 @@ pkgname=jrnl pkgver=4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Collect your thoughts and notes without leaving the command line" arch=('any') url="https://jrnl.sh/"; -license=('GPL3') -depends=('python-colorama' 'python-cryptography' 'python-keyring' 'python-parsedatetime' - 'python-dateutil' 'python-pyxdg' 'python-rich' 'python-ruamel-yaml' 'python-tzlocal') -makedepends=('python-build' 'python-installer' 'python-poetry-core') -checkdepends=('python-pytest7' 'python-pytest-bdd' 'python-pytest-xdist' 'python-toml') +license=('GPL-3.0-or-later') +depends=( + 'python' + 'python-colorama' + 'python-cryptography' + 'python-dateutil' + 'python-keyring' + 'python-parsedatetime' + 'python-pyxdg' + 'python-rich' + 'python-ruamel-yaml' + 'python-tzlocal' +) +makedepends=( + 'python-build' + 'python-installer' + 'python-poetry-core' +) +checkdepends=( + 'python-pytest' + 'python-pytest-bdd' + 'python-pytest-xdist' + 'python-toml' +) source=("https://github.com/jrnl-org/jrnl/archive/v$pkgver/$pkgname-$pkgver.tar.gz"; "pytest-bdd-compat.patch") sha512sums=('c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800e4906f14ffffc9567b3f9620f87f98fcc0b5ae355a22368f90a3279718252' @@ -18,17 +37,17 @@ sha512sums=('c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800 prepare() { cd jrnl-$pkgver - patch -Np1 -i ${srcdir}/pytest-bdd-compat.patch + patch -Np1 -i "${srcdir}/pytest-bdd-compat.patch" } build() { cd jrnl-$pkgver - python -m build -nw + python -m build --wheel --no-isolation } check() { cd jrnl-$pkgver - python -m pytest + pytest } package() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/jrnl/-/commit/6f3ed145e3d28a2858511d9dcd253939db3c388b -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/jrnl/-/commit/6f3ed145e3d28a2858511d9dcd253939db3c388b You're receiving this email because of your account on gitlab.archlinux.org.
