Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages / jrnl
Commits: c6d46611 by Jelle van der Waa at 2024-04-13T12:05:00+02:00 upgpkg: 4.1-2: rebuild with python 3.12 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + pytest-bdd-compat.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,11 +1,11 @@ pkgbase = jrnl pkgdesc = Collect your thoughts and notes without leaving the command line pkgver = 4.1 - pkgrel = 1 + pkgrel = 2 url = https://jrnl.sh/ arch = any license = GPL3 - checkdepends = python-pytest + checkdepends = python-pytest7 checkdepends = python-pytest-bdd checkdepends = python-pytest-xdist checkdepends = python-toml @@ -22,6 +22,8 @@ pkgbase = jrnl depends = python-ruamel-yaml depends = python-tzlocal source = https://github.com/jrnl-org/jrnl/archive/v4.1/jrnl-4.1.tar.gz + source = pytest-bdd-compat.patch sha512sums = c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800e4906f14ffffc9567b3f9620f87f98fcc0b5ae355a22368f90a3279718252 + sha512sums = 8f7022d8ea813ae1dac6b4965b0dcf2ccc72451f2b62fab46c5ad4c9611711c66d0ddfd7554ac0d3a5870c60631dd094e59f5ec8c764c067b6cbe9722b2f44de pkgname = jrnl ===================================== PKGBUILD ===================================== @@ -2,7 +2,7 @@ pkgname=jrnl pkgver=4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Collect your thoughts and notes without leaving the command line" arch=('any') url="https://jrnl.sh/" @@ -10,9 +10,16 @@ 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-pytest' 'python-pytest-bdd' 'python-pytest-xdist' 'python-toml') -source=("https://github.com/jrnl-org/jrnl/archive/v$pkgver/$pkgname-$pkgver.tar.gz") -sha512sums=('c5e17b8dd863cdf251f5622099e07645d65ecb27a4b765df6b6c6f89a482e73b800e4906f14ffffc9567b3f9620f87f98fcc0b5ae355a22368f90a3279718252') +checkdepends=('python-pytest7' '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' + '8f7022d8ea813ae1dac6b4965b0dcf2ccc72451f2b62fab46c5ad4c9611711c66d0ddfd7554ac0d3a5870c60631dd094e59f5ec8c764c067b6cbe9722b2f44de') + +prepare() { + cd jrnl-$pkgver + patch -Np1 -i ${srcdir}/pytest-bdd-compat.patch +} build() { cd jrnl-$pkgver ===================================== pytest-bdd-compat.patch ===================================== @@ -0,0 +1,39 @@ +From 48b61f6953ea8cb90098e506f6113ab43ac12b96 Mon Sep 17 00:00:00 2001 +From: Ben Beasley <c...@musicinmybrain.net> +Date: Thu, 28 Mar 2024 11:08:00 -0400 +Subject: [PATCH] Support pytest_bdd 7.1.2 and later (#1878) + +* Support pytest_bdd 7.1.2 and later + +Fix #1875. + +* Prevent use of pytest 8.1 for now due to unrelated error + +* poetry lock --no-update + +--------- + +Co-authored-by: Micah Jerome Ellison <micah.jerome.elli...@gmail.com> +--- + tests/lib/when_steps.py | 8 +++++++- + 3 files changed, 17 insertions(+), 24 deletions(-) + +diff --git a/tests/lib/when_steps.py b/tests/lib/when_steps.py +index 71252f866..4cd7d559f 100644 +--- a/tests/lib/when_steps.py ++++ b/tests/lib/when_steps.py +@@ -7,7 +7,13 @@ + from pytest_bdd import when + from pytest_bdd.parsers import parse + from pytest_bdd.parsers import re +-from pytest_bdd.steps import inject_fixture ++ ++# This is an undocumented and unsupported function: ++# https://github.com/pytest-dev/pytest-bdd/issues/684 ++try: ++ from pytest_bdd.compat import inject_fixture # pytest_bdd 7.1.2 and later ++except ImportError: ++ from pytest_bdd.steps import inject_fixture # pytest_bdd 7.1.1 and earlier + + from jrnl.main import run + View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/jrnl/-/commit/c6d46611c6c633a42598bff1134cb6646314ed0a -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/jrnl/-/commit/c6d46611c6c633a42598bff1134cb6646314ed0a You're receiving this email because of your account on gitlab.archlinux.org.