From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44BC3158090 for ; Sun, 22 Sep 2024 08:31:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E095E2DA0; Sun, 22 Sep 2024 08:31:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47ED1E2DA1 for ; Sun, 22 Sep 2024 08:31:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77BD9343198 for ; Sun, 22 Sep 2024 08:31:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D53CA27FB for ; Sun, 22 Sep 2024 08:31:16 +0000 (UTC) From: "Takuya Wakazono" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Takuya Wakazono" Message-ID: <1726993556.b6b2873322a589ec81305a8476b25107a1087574.pastalian46@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/b2sdk/files/, dev-python/b2sdk/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-python/b2sdk/b2sdk-2.3.0.ebuild dev-python/b2sdk/files/b2sdk-2.3.0-lazy-fixtures.patch X-VCS-Directories: dev-python/b2sdk/files/ dev-python/b2sdk/ X-VCS-Committer: pastalian46 X-VCS-Committer-Name: Takuya Wakazono X-VCS-Revision: b6b2873322a589ec81305a8476b25107a1087574 X-VCS-Branch: dev Date: Sun, 22 Sep 2024 08:31:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83145991-18c4-459d-8ed1-87692b73bdc7 X-Archives-Hash: 7a29407a1dac52be768e72448834880b commit: b6b2873322a589ec81305a8476b25107a1087574 Author: Takuya Wakazono gmail com> AuthorDate: Sun Sep 22 08:25:56 2024 +0000 Commit: Takuya Wakazono gmail com> CommitDate: Sun Sep 22 08:25:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b6b28733 dev-python/b2sdk: migrate to pytest-lazy-fixtures dev-python/pytest-lazy-fixture is broken with >=pytest-8 and replaced by dev-python/pytest-lazy-fixtures. Signed-off-by: Takuya Wakazono gmail.com> dev-python/b2sdk/b2sdk-2.3.0.ebuild | 11 +++-- .../b2sdk/files/b2sdk-2.3.0-lazy-fixtures.patch | 56 ++++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dev-python/b2sdk/b2sdk-2.3.0.ebuild b/dev-python/b2sdk/b2sdk-2.3.0.ebuild index 9677228bc..49246e375 100644 --- a/dev-python/b2sdk/b2sdk-2.3.0.ebuild +++ b/dev-python/b2sdk/b2sdk-2.3.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_PEP517="pdm-backend" PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) @@ -33,11 +33,16 @@ distutils_enable_tests pytest BDEPEND+=" test? ( $(python_gen_cond_dep ' >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] - >=dev-python/pytest-lazy-fixture-0.6.3[${PYTHON_USEDEP}] + dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}] >=dev-python/tqdm-4.66.2[${PYTHON_USEDEP}] ') )" +PATCHES=( + # migrate from pytest-lazy-fixture to pytest-lazy-fixtures + "${FILESDIR}/${P}-lazy-fixtures.patch" +) + # These tests seem to require some b2 authentication (they're integration tests # so this is not unreasonable) EPYTEST_DESELECT=( diff --git a/dev-python/b2sdk/files/b2sdk-2.3.0-lazy-fixtures.patch b/dev-python/b2sdk/files/b2sdk-2.3.0-lazy-fixtures.patch new file mode 100644 index 000000000..0a9428784 --- /dev/null +++ b/dev-python/b2sdk/files/b2sdk-2.3.0-lazy-fixtures.patch @@ -0,0 +1,56 @@ +Migrate from pytest-lazy-fixture to pytest-lazy-fixtures. +https://github.com/Backblaze/b2-sdk-python/issues/484 +--- a/test/unit/account_info/fixtures.py ++++ b/test/unit/account_info/fixtures.py +@@ -11,6 +11,7 @@ from __future__ import annotations + + import pytest + from apiver_deps import InMemoryAccountInfo, SqliteAccountInfo ++from pytest_lazy_fixtures import lf + + + @pytest.fixture +@@ -84,8 +85,8 @@ def sqlite_account_info(sqlite_account_info_factory): + + @pytest.fixture( + params=[ +- pytest.lazy_fixture('in_memory_account_info_factory'), +- pytest.lazy_fixture('sqlite_account_info_factory'), ++ lf('in_memory_account_info_factory'), ++ lf('sqlite_account_info_factory'), + ] + ) + def account_info_factory(request): +@@ -94,8 +95,8 @@ def account_info_factory(request): + + @pytest.fixture( + params=[ +- pytest.lazy_fixture('in_memory_account_info'), +- pytest.lazy_fixture('sqlite_account_info'), ++ lf('in_memory_account_info'), ++ lf('sqlite_account_info'), + ] + ) + def account_info(request): +--- a/test/unit/test_cache.py ++++ b/test/unit/test_cache.py +@@ -13,7 +13,7 @@ from dataclasses import dataclass + + import pytest + from apiver_deps import AuthInfoCache, DummyCache, InMemoryAccountInfo, InMemoryCache +-from pytest_lazyfixture import lazy_fixture ++from pytest_lazy_fixtures import lf + + + @pytest.fixture +@@ -32,8 +32,8 @@ def auth_info_cache(): + + + @pytest.fixture( +- scope="class", params=[lazy_fixture('in_memory_cache'), +- lazy_fixture('auth_info_cache')] ++ params=[lf('in_memory_cache'), ++ lf('auth_info_cache')] + ) + def cache(request): + return request.param