diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2020-12-18 15:47:19 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-26 23:04:53 +0100 |
commit | 37dd7f9ae2fdea5cc79dac0efcd7d5257c25a398 (patch) | |
tree | dffbc0ff176870b962a01b952e8fe0cc3a1d91c4 /dev-python/doit | |
parent | dev-python/dogpile-cache: Stabilize 1.1.1 ALLARCHES, #761613 (diff) | |
download | gentoo-37dd7f9ae2fdea5cc79dac0efcd7d5257c25a398.tar.gz gentoo-37dd7f9ae2fdea5cc79dac0efcd7d5257c25a398.tar.bz2 gentoo-37dd7f9ae2fdea5cc79dac0efcd7d5257c25a398.zip |
dev-python/doit: remove unused patch(es)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18709
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-python/doit')
-rw-r--r-- | dev-python/doit/files/doit-0.32.0_pytest5.4.patch | 81 | ||||
-rw-r--r-- | dev-python/doit/files/doit-0.32.0_unpickable.patch | 39 |
2 files changed, 0 insertions, 120 deletions
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 deleted file mode 100644 index 58dd154859cb..000000000000 --- a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 159b7baebfefeacb443f55f2d12cbf0876628cbc Mon Sep 17 00:00:00 2001 -From: Eduardo Schettino <schettino72@gmail.com> -Date: Wed, 22 Apr 2020 04:48:36 +0800 -Subject: [PATCH] fix tests for pytest 5.4 - ---- - dev_requirements.txt | 2 +- - tests/conftest.py | 22 +++++++--------------- - tests/test_dependency.py | 4 ++-- - 3 files changed, 10 insertions(+), 18 deletions(-) - -diff --git a/dev_requirements.txt b/dev_requirements.txt -index 1e31e4f..f16ba86 100644 ---- a/dev_requirements.txt -+++ b/dev_requirements.txt -@@ -2,6 +2,6 @@ - # $ pip install --requirement dev_requirements.txt - - pyflakes --pytest>=4.0 -+pytest>=5.4.1 - coverage>=4.0 - doit-py>=0.4.0 -diff --git a/tests/conftest.py b/tests/conftest.py -index 5c4da9f..9eab396 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -78,12 +78,9 @@ def remove_db(filename): - 'dbm.ndbm': ['.db'], - } - --def dep_manager_fixture(request, dep_class): -- # copied from tempdir plugin -- name = request._pyfuncitem.name -- name = py.std.re.sub("[\W]", "_", name) -- my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True) -- dep_file = Dependency(dep_class, os.path.join(my_tmpdir.strpath, "testdb")) -+def dep_manager_fixture(request, dep_class, tmp_path_factory): -+ filename = str(tmp_path_factory.mktemp('x', True) / 'testdb') -+ dep_file = Dependency(dep_class, filename) - dep_file.whichdb = whichdb(dep_file.name) if dep_class is DbmDB else 'XXX' - dep_file.name_ext = db_ext.get(dep_file.whichdb, ['']) - -@@ -97,18 +94,13 @@ def remove_depfile(): - - - @pytest.fixture --def dep_manager(request): -- return dep_manager_fixture(request, DbmDB) -+def dep_manager(request, tmp_path_factory): -+ return dep_manager_fixture(request, DbmDB, tmp_path_factory) - - - @pytest.fixture --def depfile_name(request): -- # copied from tempdir plugin -- name = request._pyfuncitem.name -- name = py.std.re.sub("[\W]", "_", name) -- my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True) -- depfile_name = (os.path.join(my_tmpdir.strpath, "testdb")) -- -+def depfile_name(request, tmp_path_factory): -+ depfile_name = str(tmp_path_factory.mktemp('x', True) / 'testdb') - def remove_depfile(): - remove_db(depfile_name) - request.addfinalizer(remove_depfile) -diff --git a/tests/test_dependency.py b/tests/test_dependency.py -index 3fc2a14..f84e002 100644 ---- a/tests/test_dependency.py -+++ b/tests/test_dependency.py -@@ -68,8 +68,8 @@ def test_sqlite_import(): - # create a separate fixture to be used only by this module - # because only here it is required to test with all backends - @pytest.fixture(params=[JsonDB, DbmDB, SqliteDB]) --def pdep_manager(request): -- return dep_manager_fixture(request, request.param) -+def pdep_manager(request, tmp_path_factory): -+ return dep_manager_fixture(request, request.param, tmp_path_factory) - - - diff --git a/dev-python/doit/files/doit-0.32.0_unpickable.patch b/dev-python/doit/files/doit-0.32.0_unpickable.patch deleted file mode 100644 index d96da6cd73c6..000000000000 --- a/dev-python/doit/files/doit-0.32.0_unpickable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df4dc1c6a92d9f50cfe7f56d9507eca5bc56870e Mon Sep 17 00:00:00 2001 -From: Stefano Rivera <stefano@rivera.za.net> -Date: Sun, 2 Feb 2020 13:02:58 +0100 -Subject: [PATCH] Replace recursive knot with explicitly unpicklable object - -Python 3.8 was able to pickle the previously unpicklable. Instead of -relying on limits, let's raise an explicit error. - -Fixes: #341 ---- - tests/test_runner.py | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/tests/test_runner.py b/tests/test_runner.py -index 51c8a61..a9029e8 100644 ---- a/tests/test_runner.py -+++ b/tests/test_runner.py -@@ -577,17 +577,12 @@ def non_top_function(): return 4 - t2 = pickle.loads(t1p) - assert 4 == t2.actions[0].py_callable() - -- @pytest.mark.xfail('PLAT_IMPL == "PyPy"') # pypy can handle it :) - def test_not_picklable_raises_InvalidTask(self): -- # create a large enough recursive obj so pickle fails -- d1 = {} -- last = d1 -- for x in range(400): -- dn = {'p': last} -- last = dn -- d1['p'] = last -- - def non_top_function(): pass -+ class Unpicklable: -+ def __getstate__(self): -+ raise pickle.PicklingError("DO NOT PICKLE") -+ d1 = Unpicklable() - t1 = Task('t1', [non_top_function, (d1,)]) - pytest.raises(InvalidTask, runner.JobTask, t1) - |