Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/gitdb/files/, dev-python/gitdb/
Date: Sat, 31 Dec 2022 10:56:03
Message-Id: 1672484148.badfe543da70f23ed97cf2b68aa490a2b9b73e13.mgorny@gentoo
1 commit: badfe543da70f23ed97cf2b68aa490a2b9b73e13
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 10:46:01 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 10:55:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badfe543
7
8 dev-python/gitdb: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/gitdb/Manifest | 1 -
13 .../gitdb/files/gitdb-4.0.9-nose-to-pytest.patch | 75 ----------------------
14 dev-python/gitdb/gitdb-4.0.9-r1.ebuild | 63 ------------------
15 3 files changed, 139 deletions(-)
16
17 diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
18 index 00b3ec8cf7c0..4e14e02df8fc 100644
19 --- a/dev-python/gitdb/Manifest
20 +++ b/dev-python/gitdb/Manifest
21 @@ -1,2 +1 @@
22 DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b
23 -DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109
24
25 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
26 deleted file mode 100644
27 index fe38e8c613ee..000000000000
28 --- a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
29 +++ /dev/null
30 @@ -1,75 +0,0 @@
31 -From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001
32 -From: Carl George <carl@××××××.computer>
33 -Date: Wed, 9 Feb 2022 17:15:39 -0600
34 -Subject: [PATCH] Switch from nose to pytest
35 -
36 -This is not a full rewrite to pytest style tests, it just changes the
37 -minimum to allow pytest to run the existing tests.
38 -
39 -Resolves #72
40 ----
41 - .github/workflows/pythonpackage.yml | 6 +++---
42 - Makefile | 3 +--
43 - README.rst | 4 ++--
44 - gitdb.pro.user | 3 +--
45 - gitdb/test/db/test_pack.py | 4 ++--
46 - gitdb/test/lib.py | 4 ++--
47 - gitdb/test/test_pack.py | 4 ++--
48 - 7 files changed, 13 insertions(+), 15 deletions(-)
49 -
50 -diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
51 -index ff96a58..4539f42 100644
52 ---- a/gitdb/test/db/test_pack.py
53 -+++ b/gitdb/test/db/test_pack.py
54 -@@ -16,7 +16,7 @@
55 - import random
56 - import sys
57 -
58 --from nose.plugins.skip import SkipTest
59 -+import pytest
60 -
61 - class TestPackDB(TestDBBase):
62 -
63 -@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
64 - @with_packs_rw
65 - def test_writing(self, path):
66 - if sys.platform == "win32":
67 -- raise SkipTest("FIXME: Currently fail on windows")
68 -+ pytest.skip("FIXME: Currently fail on windows")
69 -
70 - pdb = PackedDB(path)
71 -
72 -diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
73 -index a04084f..abd4ad5 100644
74 ---- a/gitdb/test/lib.py
75 -+++ b/gitdb/test/lib.py
76 -@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
77 - @wraps(func)
78 - def wrapper(self, *args, **kwargs):
79 - if 'TRAVIS' in os.environ:
80 -- import nose
81 -- raise nose.SkipTest("Cannot run on travis-ci")
82 -+ import pytest
83 -+ pytest.skip("Cannot run on travis-ci")
84 - # end check for travis ci
85 - return func(self, *args, **kwargs)
86 - # end wrapper
87 -diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
88 -index 4b01741..f946197 100644
89 ---- a/gitdb/test/test_pack.py
90 -+++ b/gitdb/test/test_pack.py
91 -@@ -26,7 +26,7 @@
92 - from gitdb.exc import UnsupportedOperation
93 - from gitdb.util import to_bin_sha
94 -
95 --from nose import SkipTest
96 -+import pytest
97 -
98 - import os
99 - import tempfile
100 -@@ -246,4 +246,4 @@ def rewind_streams():
101 - def test_pack_64(self):
102 - # TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
103 - # of course without really needing such a huge pack
104 -- raise SkipTest()
105 -+ pytest.skip('not implemented')
106
107 diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
108 deleted file mode 100644
109 index 5eb050582e8b..000000000000
110 --- a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
111 +++ /dev/null
112 @@ -1,63 +0,0 @@
113 -# Copyright 1999-2022 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=8
117 -
118 -DISTUTILS_USE_PEP517=setuptools
119 -PYTHON_COMPAT=( python3_{8..11} )
120 -
121 -inherit distutils-r1
122 -
123 -DESCRIPTION="GitDB is a pure-Python git object database"
124 -HOMEPAGE="
125 - https://github.com/gitpython-developers/gitdb/
126 - https://pypi.org/project/gitdb/
127 -"
128 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
129 -
130 -LICENSE="BSD"
131 -SLOT="0"
132 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
133 -
134 -RDEPEND="
135 - >=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
136 -"
137 -BDEPEND="
138 - test? (
139 - dev-vcs/git
140 - )
141 -"
142 -
143 -PATCHES=(
144 - "${FILESDIR}/${P}-nose-to-pytest.patch"
145 -)
146 -
147 -distutils_enable_tests pytest
148 -
149 -src_test() {
150 - local i
151 -
152 - mkdir "${T}"/repo || die
153 - cd "${T}"/repo || die
154 -
155 - for (( i = 0; i < 2500; ++i )); do
156 - echo "${i}" > file"${i}" || die
157 - done
158 -
159 - git init || die
160 - git config user.email "you@×××××××.com" || die
161 - git config user.name "Your Name" || die
162 - git add -A || die
163 - git commit -q -m ".." || die
164 - git clone --bare "${T}"/repo "${T}"/repo.git || die
165 - cd "${S}" || die
166 -
167 - distutils-r1_src_test
168 -}
169 -
170 -python_test() {
171 - #TRAVIS=1 disables performance tests which rely on the gitdb repo
172 - local -x TRAVIS=1
173 - local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
174 - epytest
175 -}