gentoo resync : 29.12.2022

4 files changed, 85 insertions, 61 deletions

diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index da309b704fa2..a2484f637a69 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,4 @@
-DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
+AUX gitdb-4.0.9-nose-to-pytest.patch 2453 BLAKE2B 6c827808467f874d500bd6b15cefae6292d01ad9f104e8085e5038c92970a329847654c097b6be8e3a2edeb42ff0c2ebc708de9601f74cb90a4bbfdba31e1cf6 SHA512 d5878b74919cec9481b6f0012e35bb01e4fbfc42d053900f1ef1af3f1f4ebcc01c3a0a14a4e60519d24cafd5c51fb43174c58ac00f5bc7eceea10a8ec1f2f3bc
 DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109
-EBUILD gitdb-4.0.8.ebuild 1209 BLAKE2B 7e119209dcfae9a1103c0a53496ce5b36972e76a786340869707dd41a041a2acb672058fe55e0fb3ec627fb0dcafe2675fe2948ba4f44e09de41184df4184295 SHA512 1ee0583c19e3091f97f6e20779e1b14f7b4fd8e14be1ab32a25ea3915c170debd8359c224c51b38e89f66994289ce1e2c61ff9dfc5e3f0c99f17fcb92d02cb55
-EBUILD gitdb-4.0.9.ebuild 1254 BLAKE2B 0de9b98a7cbb256145d0142e7d5f4c169a5787bcf83f75b711bf546e98f21bb263bb9abd23e5aef70d20f52902fe7804ae977b58b2a303664d9d298629e05350 SHA512 2392ec273180f309bad7a9afcc543749cd4971efa34c1ef9796f8d53f6c63bff094abacf5c13761a9e9d726a6cadaaf3c7449d6c063a6e4f1dc4f30bf63e407e
+EBUILD gitdb-4.0.9-r1.ebuild 1267 BLAKE2B 22afdea4f7c6cce18b10019f72d2ef391236411d749078446b70231409bb1882140a2b00534d55649ca8521658204c147ec64b976b150f5555aed162b8f46cea SHA512 8a253957a94a0f4f58558dfa5e5804cede22f470a0a0596ed921e62ac962a0ea9aaaaa811a1e71fc76ec7ef5b09abc9459f97a475dfd74216666d5bc59b31c68
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
new file mode 100644
index 000000000000..fe38e8c613ee
--- /dev/null
+++ b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
@@ -0,0 +1,75 @@
+From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Wed, 9 Feb 2022 17:15:39 -0600
+Subject: [PATCH] Switch from nose to pytest
+
+This is not a full rewrite to pytest style tests, it just changes the
+minimum to allow pytest to run the existing tests.
+
+Resolves #72
+---
+ .github/workflows/pythonpackage.yml | 6 +++---
+ Makefile                            | 3 +--
+ README.rst                          | 4 ++--
+ gitdb.pro.user                      | 3 +--
+ gitdb/test/db/test_pack.py          | 4 ++--
+ gitdb/test/lib.py                   | 4 ++--
+ gitdb/test/test_pack.py             | 4 ++--
+ 7 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
+index ff96a58..4539f42 100644
+--- a/gitdb/test/db/test_pack.py
++++ b/gitdb/test/db/test_pack.py
+@@ -16,7 +16,7 @@
+ import random
+ import sys
+ 
+-from nose.plugins.skip import SkipTest
++import pytest
+ 
+ class TestPackDB(TestDBBase):
+ 
+@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
+     @with_packs_rw
+     def test_writing(self, path):
+         if sys.platform == "win32":
+-            raise SkipTest("FIXME: Currently fail on windows")
++            pytest.skip("FIXME: Currently fail on windows")
+ 
+         pdb = PackedDB(path)
+ 
+diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
+index a04084f..abd4ad5 100644
+--- a/gitdb/test/lib.py
++++ b/gitdb/test/lib.py
+@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
+     @wraps(func)
+     def wrapper(self, *args, **kwargs):
+         if 'TRAVIS' in os.environ:
+-            import nose
+-            raise nose.SkipTest("Cannot run on travis-ci")
++            import pytest
++            pytest.skip("Cannot run on travis-ci")
+         # end check for travis ci
+         return func(self, *args, **kwargs)
+     # end wrapper
+diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
+index 4b01741..f946197 100644
+--- a/gitdb/test/test_pack.py
++++ b/gitdb/test/test_pack.py
+@@ -26,7 +26,7 @@
+ from gitdb.exc import UnsupportedOperation
+ from gitdb.util import to_bin_sha
+ 
+-from nose import SkipTest
++import pytest
+ 
+ import os
+ import tempfile
+@@ -246,4 +246,4 @@ def rewind_streams():
+     def test_pack_64(self):
+         # TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
+         # of course without really needing such a huge pack
+-        raise SkipTest()
++        pytest.skip('not implemented')
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
deleted file mode 100644
index 8c146410de5a..000000000000
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)"
-
-distutils_enable_tests nose
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb/gitdb-4.0.9.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
index 94184a149103..5eb050582e8b 100644
--- a/dev-python/gitdb/gitdb-4.0.9.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
@@ -28,7 +28,11 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests nose
+PATCHES=(
+	"${FILESDIR}/${P}-nose-to-pytest.patch"
+)
+
+distutils_enable_tests pytest
 
 src_test() {
 	local i
@@ -55,5 +59,5 @@ python_test() {
 	#TRAVIS=1 disables performance tests which rely on the gitdb repo
 	local -x TRAVIS=1
 	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
+	epytest
 }