From ea5bad4d0ba1eb937df22adb7f6cc57ea77f03d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Dec 2022 14:19:51 +0000 Subject: gentoo auto-resync : 31:12:2022 - 14:19:51 --- dev-python/gitdb/Manifest | 5 +- .../gitdb/files/gitdb-4.0.9-nose-to-pytest.patch | 75 ---------------------- dev-python/gitdb/gitdb-4.0.10.ebuild | 2 +- dev-python/gitdb/gitdb-4.0.9-r1.ebuild | 63 ------------------ 4 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch delete mode 100644 dev-python/gitdb/gitdb-4.0.9-r1.ebuild (limited to 'dev-python/gitdb') diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest index 733d5a61e4e1..b836f28e704b 100644 --- a/dev-python/gitdb/Manifest +++ b/dev-python/gitdb/Manifest @@ -1,6 +1,3 @@ -AUX gitdb-4.0.9-nose-to-pytest.patch 2453 BLAKE2B 6c827808467f874d500bd6b15cefae6292d01ad9f104e8085e5038c92970a329847654c097b6be8e3a2edeb42ff0c2ebc708de9601f74cb90a4bbfdba31e1cf6 SHA512 d5878b74919cec9481b6f0012e35bb01e4fbfc42d053900f1ef1af3f1f4ebcc01c3a0a14a4e60519d24cafd5c51fb43174c58ac00f5bc7eceea10a8ec1f2f3bc DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b -DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109 -EBUILD gitdb-4.0.10.ebuild 1194 BLAKE2B 948ea4e89ee655509bc837e3001452c67f72a1093237d3c7259ade2074bec40727e30e294a27bcd1f5c123f6d34a43f4843b6c7ba78c09be10cc08685c19cef6 SHA512 ebd8ef0848e4bc4d8bac7aaaaf3122658d8705ab37d70f209ff2910452c84f95cced7c8914a11efd96f49fbc7749b26a9e377ef5683f0eb5c7514211f56bf039 -EBUILD gitdb-4.0.9-r1.ebuild 1267 BLAKE2B 22afdea4f7c6cce18b10019f72d2ef391236411d749078446b70231409bb1882140a2b00534d55649ca8521658204c147ec64b976b150f5555aed162b8f46cea SHA512 8a253957a94a0f4f58558dfa5e5804cede22f470a0a0596ed921e62ac962a0ea9aaaaa811a1e71fc76ec7ef5b09abc9459f97a475dfd74216666d5bc59b31c68 +EBUILD gitdb-4.0.10.ebuild 1186 BLAKE2B 5af8f028ecb71299522b7a3884d647f567ae2e9378124d5eb404c3ed77bacd31220eb809cdefea45bc5817263e92fc9186c275bf89fb3fad63084e410599a685 SHA512 d1a4a59661cc0f0835eba068ad359b9b1269d7df3bc68dfb976c576e0a86664b09402af2c21099ae6eebdeb885fde5a45ba8958c857bec4698fccd4d54cb6ded 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 deleted file mode 100644 index fe38e8c613ee..000000000000 --- a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001 -From: Carl George -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.10.ebuild b/dev-python/gitdb/gitdb-4.0.10.ebuild index a647deebb1cb..e07ae8b3b614 100644 --- a/dev-python/gitdb/gitdb-4.0.10.ebuild +++ b/dev-python/gitdb/gitdb-4.0.10.ebuild @@ -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/smmap-3.0.1[${PYTHON_USEDEP}] diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild deleted file mode 100644 index 5eb050582e8b..000000000000 --- a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -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 ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/smmap-3.0.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-vcs/git - ) -" - -PATCHES=( - "${FILESDIR}/${P}-nose-to-pytest.patch" -) - -distutils_enable_tests pytest - -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 - epytest -} -- cgit v1.2.3