Adding metadata

4 files changed, 64 insertions, 53 deletions

diff --git a/dev-python/b2sdk/Manifest b/dev-python/b2sdk/Manifest
index 7a6f26b16bec..459ce72f7746 100644
--- a/dev-python/b2sdk/Manifest
+++ b/dev-python/b2sdk/Manifest
@@ -1,2 +1 @@
-DIST b2sdk-2.0.0.tar.gz 378875 BLAKE2B 0d65eb0b9238fccb5f6ef2252280cb9891c1fbf9bfddc2ef38692f5063fc0384eefab26876126d9dc056f178788e72a970f604fb8f9952e1ef6cd62a2417ab9d SHA512 97700574cd948a8a177bb52edc89e67d8f1cf6efcc7227c8581af30cdc95dc7e54afd30357f5723f2abee05cdbbf17d6b26494c586c2851782bebb72224386c0
 DIST b2sdk-2.3.0.tar.gz 390949 BLAKE2B e14c9fc56b7ed66350b8d73456dd50b0f6fdb40d7a6fe73cf7950afcb25bb5257a63bb361d8cbca99116b4999a2b0195967b4e08aff5ca9aaf5c16e4b4b532eb SHA512 29ba07581d0e587b413396f128d7fe14f8ac25ea0553eef69e1c428823690974d9373db727321f9838886a07946c36defdd5bae24d31266751d6b1a2f05968c6
diff --git a/dev-python/b2sdk/b2sdk-2.0.0-r1.ebuild b/dev-python/b2sdk/b2sdk-2.0.0-r1.ebuild
deleted file mode 100644
index e006400b91ff..000000000000
--- a/dev-python/b2sdk/b2sdk-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517="pdm-backend"
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="The client library for BackBlaze's B2 product"
-HOMEPAGE="https://github.com/Backblaze/b2-sdk-python"
-SRC_URI="https://github.com/Backblaze/b2-sdk-python/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/b2-sdk-python-${PV}"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-export PDM_BUILD_SCM_VERSION=${PV}
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/logfury-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-	')
-"
-
-distutils_enable_tests pytest
-
-# tqdm dependency is temporary, see
-# https://github.com/Backblaze/b2-sdk-python/issues/489
-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/tqdm-4.66.2[${PYTHON_USEDEP}]
-	')
-)"
-
-EPYTEST_DESELECT=(
-	test/integration/test_large_files.py::TestLargeFile::test_large_file
-	test/integration/test_raw_api.py::test_raw_api
-	test/integration/test_download.py
-	test/integration/test_upload.py
-	test/unit/account_info/test_sqlite_account_info.py
-	test/unit/b2http/test_b2http.py::TestSetLocaleContextManager::test_set_locale_context_manager \
-	test/integration/test_file_version_attributes.py
-)
diff --git a/dev-python/b2sdk/b2sdk-2.3.0.ebuild b/dev-python/b2sdk/b2sdk-2.3.0.ebuild
index 715b35d198f1..1e9cf68019a0 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_{8,9,10,11,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 000000000000..0a942878433c
--- /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