1 |
commit: 7938bcce6cf79addfd1c0b6e7bedee7a51b564e2 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 24 18:58:28 2022 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 24 18:58:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=7938bcce |
7 |
|
8 |
PythonCheck: remove obsolete pypy packages |
9 |
|
10 |
Unlist the removed dev-python/pypy*-bin and virtual/pypy* packages |
11 |
from PythonCheck, as well as the no-longer-relevant virtual/pypy* |
12 |
exceptions. |
13 |
|
14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
15 |
|
16 |
src/pkgcheck/checks/python.py | 11 ----------- |
17 |
tests/checks/test_python.py | 6 ------ |
18 |
2 files changed, 17 deletions(-) |
19 |
|
20 |
diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py |
21 |
index 5d6a8a1a..bb4825e2 100644 |
22 |
--- a/src/pkgcheck/checks/python.py |
23 |
+++ b/src/pkgcheck/checks/python.py |
24 |
@@ -22,14 +22,8 @@ INTERPRETERS = frozenset([ |
25 |
'dev-lang/python', |
26 |
'dev-python/pypy', |
27 |
'dev-python/pypy3', |
28 |
- 'dev-python/pypy-bin', |
29 |
- 'dev-python/pypy3-bin', |
30 |
- 'virtual/pypy', |
31 |
- 'virtual/pypy3', |
32 |
]) |
33 |
|
34 |
-CHECK_EXCLUDE = frozenset(['virtual/pypy', 'virtual/pypy3']) |
35 |
- |
36 |
IUSE_PREFIX = 'python_targets_' |
37 |
IUSE_PREFIX_S = 'python_single_target_' |
38 |
|
39 |
@@ -439,11 +433,6 @@ class PythonCheck(Check): |
40 |
return |
41 |
|
42 |
if eclass is None: |
43 |
- # virtual/pypy* need to be exempted as they serve as slot-matchers |
44 |
- # for other packages |
45 |
- if pkg.key in CHECK_EXCLUDE: |
46 |
- return |
47 |
- |
48 |
# check whether we should be using one |
49 |
highest_found = None |
50 |
for attr in (x.lower() for x in pkg.eapi.dep_keys): |
51 |
|
52 |
diff --git a/tests/checks/test_python.py b/tests/checks/test_python.py |
53 |
index 411fff7f..992b7dce 100644 |
54 |
--- a/tests/checks/test_python.py |
55 |
+++ b/tests/checks/test_python.py |
56 |
@@ -105,12 +105,6 @@ class TestPythonCheck(misc.ReportTestCase): |
57 |
self.assertReport(self.check, self.mk_pkg(RDEPEND='dev-python/pypy')), |
58 |
python.MissingPythonEclass) |
59 |
|
60 |
- # special exception: virtual/pypy |
61 |
- self.assertNoReport(self.check, self.mk_pkg(cpv='virtual/pypy-4.1', |
62 |
- RDEPEND='|| ( dev-python/pypy:0/41 dev-python/pypy-bin:0/41 )')) |
63 |
- self.assertNoReport(self.check, self.mk_pkg(cpv='virtual/pypy3-4.1', |
64 |
- RDEPEND='|| ( dev-python/pypy3:0/41 dev-python/pypy3-bin:0/41 )')) |
65 |
- |
66 |
def test_missing_eclass_pdepend(self): |
67 |
self.assertNoReport( |
68 |
self.check, |