gentoo new year resync : 01.01.2021

3 files changed, 0 insertions, 122 deletions

diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 6fb876de7ce2..a03570df5924 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,5 +1,3 @@
-AUX doit-0.32.0_pytest5.4.patch 2862 BLAKE2B 3a3859fc2a5a2c0f533a3c4a300744d5c4b73edc9b255f54267c6018218c393478e2feb6f43874250ba931effeaa576cfb38cec5cb7f934031071744c0d3b2f0 SHA512 2f4d251970e042adc631a9912705a0f97bd693f5cdba3e89fcb912c91f881c2c57665bd32a28630053fb1e9c2ebce022b40974a303c5e808ae0d2008f07c3e8e
-AUX doit-0.32.0_unpickable.patch 1371 BLAKE2B c03d757a99e44bbf7c7dbcac84295e7514055921d2c3a12bb3fca2fbc7e8320c8be450a5c101d39b51b8f0bb7fa1b1faa3c58a455ab5c27a68f6e03a70ea9763 SHA512 2d17f32876897a6b73ba7936eade594a0a40f38a27d08e14603f3aceb9b36426d810e0dc0b13b385c8e4cab830976637ed4462014dab7202226d3bb3f745cc8a
 DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
 EBUILD doit-0.33.1.ebuild 1284 BLAKE2B df89fc3b29adce859623eeb1078eb0cc11fd287c50da68ba45e3499ad039af97bc7463c6024fd333382bde6b1e82ab4ecf24e4848d286425a863cd46ac4c4d5e SHA512 910595f456fdd996d2a82bebf72cdf042a85baccff109fbb52442aaefc1daba4ff1149981b74af4084e036a8c069e80c65bbc06c078e0bc25cd571b1b2b261fc
 MISC metadata.xml 537 BLAKE2B 14f6b2a75d51ca56c61e5700fd7787cb6653722ace4de42510ba1c781523a2050793398d2832aaaa92d87c04ce1f30ba86d0fc2c976ac2d1cd0e0ae5fad8da99 SHA512 fe7a8bfc06411b14d6df95f79c46fc66b68a4c9db0f15a63ece8c905a5dfcc67ef0a1a5f5af09ba0bad80317b93c2336fe788cdf6d390d344e1fed6ab02db889
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)
-