1 |
commit: 37dd7f9ae2fdea5cc79dac0efcd7d5257c25a398 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 18 14:47:19 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 22:04:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dd7f9a |
7 |
|
8 |
dev-python/doit: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18709 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
dev-python/doit/files/doit-0.32.0_pytest5.4.patch | 81 ---------------------- |
16 |
dev-python/doit/files/doit-0.32.0_unpickable.patch | 39 ----------- |
17 |
2 files changed, 120 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch b/dev-python/doit/files/doit-0.32.0_pytest5.4.patch |
20 |
deleted file mode 100644 |
21 |
index 58dd154859c..00000000000 |
22 |
--- a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch |
23 |
+++ /dev/null |
24 |
@@ -1,81 +0,0 @@ |
25 |
-From 159b7baebfefeacb443f55f2d12cbf0876628cbc Mon Sep 17 00:00:00 2001 |
26 |
-From: Eduardo Schettino <schettino72@×××××.com> |
27 |
-Date: Wed, 22 Apr 2020 04:48:36 +0800 |
28 |
-Subject: [PATCH] fix tests for pytest 5.4 |
29 |
- |
30 |
---- |
31 |
- dev_requirements.txt | 2 +- |
32 |
- tests/conftest.py | 22 +++++++--------------- |
33 |
- tests/test_dependency.py | 4 ++-- |
34 |
- 3 files changed, 10 insertions(+), 18 deletions(-) |
35 |
- |
36 |
-diff --git a/dev_requirements.txt b/dev_requirements.txt |
37 |
-index 1e31e4f..f16ba86 100644 |
38 |
---- a/dev_requirements.txt |
39 |
-+++ b/dev_requirements.txt |
40 |
-@@ -2,6 +2,6 @@ |
41 |
- # $ pip install --requirement dev_requirements.txt |
42 |
- |
43 |
- pyflakes |
44 |
--pytest>=4.0 |
45 |
-+pytest>=5.4.1 |
46 |
- coverage>=4.0 |
47 |
- doit-py>=0.4.0 |
48 |
-diff --git a/tests/conftest.py b/tests/conftest.py |
49 |
-index 5c4da9f..9eab396 100644 |
50 |
---- a/tests/conftest.py |
51 |
-+++ b/tests/conftest.py |
52 |
-@@ -78,12 +78,9 @@ def remove_db(filename): |
53 |
- 'dbm.ndbm': ['.db'], |
54 |
- } |
55 |
- |
56 |
--def dep_manager_fixture(request, dep_class): |
57 |
-- # copied from tempdir plugin |
58 |
-- name = request._pyfuncitem.name |
59 |
-- name = py.std.re.sub("[\W]", "_", name) |
60 |
-- my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True) |
61 |
-- dep_file = Dependency(dep_class, os.path.join(my_tmpdir.strpath, "testdb")) |
62 |
-+def dep_manager_fixture(request, dep_class, tmp_path_factory): |
63 |
-+ filename = str(tmp_path_factory.mktemp('x', True) / 'testdb') |
64 |
-+ dep_file = Dependency(dep_class, filename) |
65 |
- dep_file.whichdb = whichdb(dep_file.name) if dep_class is DbmDB else 'XXX' |
66 |
- dep_file.name_ext = db_ext.get(dep_file.whichdb, ['']) |
67 |
- |
68 |
-@@ -97,18 +94,13 @@ def remove_depfile(): |
69 |
- |
70 |
- |
71 |
- @pytest.fixture |
72 |
--def dep_manager(request): |
73 |
-- return dep_manager_fixture(request, DbmDB) |
74 |
-+def dep_manager(request, tmp_path_factory): |
75 |
-+ return dep_manager_fixture(request, DbmDB, tmp_path_factory) |
76 |
- |
77 |
- |
78 |
- @pytest.fixture |
79 |
--def depfile_name(request): |
80 |
-- # copied from tempdir plugin |
81 |
-- name = request._pyfuncitem.name |
82 |
-- name = py.std.re.sub("[\W]", "_", name) |
83 |
-- my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True) |
84 |
-- depfile_name = (os.path.join(my_tmpdir.strpath, "testdb")) |
85 |
-- |
86 |
-+def depfile_name(request, tmp_path_factory): |
87 |
-+ depfile_name = str(tmp_path_factory.mktemp('x', True) / 'testdb') |
88 |
- def remove_depfile(): |
89 |
- remove_db(depfile_name) |
90 |
- request.addfinalizer(remove_depfile) |
91 |
-diff --git a/tests/test_dependency.py b/tests/test_dependency.py |
92 |
-index 3fc2a14..f84e002 100644 |
93 |
---- a/tests/test_dependency.py |
94 |
-+++ b/tests/test_dependency.py |
95 |
-@@ -68,8 +68,8 @@ def test_sqlite_import(): |
96 |
- # create a separate fixture to be used only by this module |
97 |
- # because only here it is required to test with all backends |
98 |
- @pytest.fixture(params=[JsonDB, DbmDB, SqliteDB]) |
99 |
--def pdep_manager(request): |
100 |
-- return dep_manager_fixture(request, request.param) |
101 |
-+def pdep_manager(request, tmp_path_factory): |
102 |
-+ return dep_manager_fixture(request, request.param, tmp_path_factory) |
103 |
- |
104 |
- |
105 |
- |
106 |
|
107 |
diff --git a/dev-python/doit/files/doit-0.32.0_unpickable.patch b/dev-python/doit/files/doit-0.32.0_unpickable.patch |
108 |
deleted file mode 100644 |
109 |
index d96da6cd73c..00000000000 |
110 |
--- a/dev-python/doit/files/doit-0.32.0_unpickable.patch |
111 |
+++ /dev/null |
112 |
@@ -1,39 +0,0 @@ |
113 |
-From df4dc1c6a92d9f50cfe7f56d9507eca5bc56870e Mon Sep 17 00:00:00 2001 |
114 |
-From: Stefano Rivera <stefano@×××××××××.net> |
115 |
-Date: Sun, 2 Feb 2020 13:02:58 +0100 |
116 |
-Subject: [PATCH] Replace recursive knot with explicitly unpicklable object |
117 |
- |
118 |
-Python 3.8 was able to pickle the previously unpicklable. Instead of |
119 |
-relying on limits, let's raise an explicit error. |
120 |
- |
121 |
-Fixes: #341 |
122 |
---- |
123 |
- tests/test_runner.py | 13 ++++--------- |
124 |
- 1 file changed, 4 insertions(+), 9 deletions(-) |
125 |
- |
126 |
-diff --git a/tests/test_runner.py b/tests/test_runner.py |
127 |
-index 51c8a61..a9029e8 100644 |
128 |
---- a/tests/test_runner.py |
129 |
-+++ b/tests/test_runner.py |
130 |
-@@ -577,17 +577,12 @@ def non_top_function(): return 4 |
131 |
- t2 = pickle.loads(t1p) |
132 |
- assert 4 == t2.actions[0].py_callable() |
133 |
- |
134 |
-- @pytest.mark.xfail('PLAT_IMPL == "PyPy"') # pypy can handle it :) |
135 |
- def test_not_picklable_raises_InvalidTask(self): |
136 |
-- # create a large enough recursive obj so pickle fails |
137 |
-- d1 = {} |
138 |
-- last = d1 |
139 |
-- for x in range(400): |
140 |
-- dn = {'p': last} |
141 |
-- last = dn |
142 |
-- d1['p'] = last |
143 |
-- |
144 |
- def non_top_function(): pass |
145 |
-+ class Unpicklable: |
146 |
-+ def __getstate__(self): |
147 |
-+ raise pickle.PicklingError("DO NOT PICKLE") |
148 |
-+ d1 = Unpicklable() |
149 |
- t1 = Task('t1', [non_top_function, (d1,)]) |
150 |
- pytest.raises(InvalidTask, runner.JobTask, t1) |
151 |
- |