commit: 3beb3999ac0c353b11e6a33b2cd7856e37fc92e6 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Sep 19 16:22:12 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Sep 20 14:38:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3beb3999
dev-util/buildbot: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/17603 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...-gentoo-to-the-VERSION_ID-check-exclusion.patch | 26 ------- .../buildbot/files/buildbot-2.8.0.fakedb.patch | 10 --- dev-util/buildbot/files/pypugjs.patch | 84 ---------------------- 3 files changed, 120 deletions(-) diff --git a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch deleted file mode 100644 index 16fc0a133e1..00000000000 --- a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec <[email protected]> -Date: Tue, 5 Mar 2019 11:21:14 -0800 -Subject: [PATCH] test_buildbot_net_usage.py: Add "gentoo" to the VERSION_ID check exclusion - -Make the exclusions test into a list (slight speed improvement, easier to extend) and add "gentoo". - -Signed-off-by: Brian Dolbec <[email protected]> ---- - buildbot/test/unit/test_buildbot_net_usage_data.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/buildbot/test/unit/test_buildbot_net_usage_data.py -index c347956..e422c55 100644 ---- a/buildbot/test/unit/test_buildbot_net_usage_data.py -+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py -@@ -150,5 +150,5 @@ class Tests(unittest.TestCase): - self.assertEqual(len(distro), 2) - self.assertNotIn("unknown", distro[0]) - # Rolling distributions like Arch Linux (arch) does not have VERSION_ID -- if distro[0] != "arch": -+ if distro[0] not in ["arch", "gentoo"]: - self.assertNotIn("unknown", distro[1]) --- -libgit2 0.99.0 - diff --git a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch deleted file mode 100644 index 2ce217b0d2e..00000000000 --- a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py 2020-06-01 15:14:03.169026527 -0700 -+++ b/setup.py 2020-06-01 15:17:38.619177059 -0700 -@@ -194,6 +194,7 @@ - "buildbot.test", - "buildbot.test.util", - "buildbot.test.fake", -+ "buildbot.test.fakedb", - "buildbot.test.fuzz", - "buildbot.test.integration", - "buildbot.test.integration.interop", diff --git a/dev-util/buildbot/files/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch deleted file mode 100644 index 3ac99502b5d..00000000000 --- a/dev-util/buildbot/files/pypugjs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec <[email protected]> -Date: Sat, 25 Apr 2020 11:53:06 -0700 -Subject: [PATCH] Initial pyjade port to pypugjs - ---- - common/code_spelling_ignore_words.txt | 1 + - master/buildbot/test/unit/test_www_config.py | 8 ++++---- - master/buildbot/www/config.py | 10 +++++----- - master/docs/manual/configuration/www.rst | 10 ++++++---- - master/docs/spelling_wordlist.txt | 2 +- - master/setup.py | 4 ++-- - requirements-ci.txt | 2 +- - 7 files changed, 20 insertions(+), 17 deletions(-) - -diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py -index 23a108e..a8c24ec 100644 ---- a/buildbot/test/unit/test_www_config.py -+++ b/buildbot/test/unit/test_www_config.py -@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): - def test_parseCustomTemplateDir(self): - exp = {'views/builds.html': '<div>\n</div>'} - try: -- # we make the test work if pyjade is present or note -- # It is better than just skip if pyjade is not there -- import pyjade # pylint: disable=import-outside-toplevel -- [pyjade] -+ # we make the test work if pypugjs is present or note -+ # It is better than just skip if pypugjs is not there -+ import pypugjs # pylint: disable=import-outside-toplevel -+ [pypugjs] - exp.update({'plugin/views/plugin.html': - '<div class="myclass"><pre>this is customized</pre></div>'}) - except ImportError: -diff --git a/buildbot/www/config.py b/buildbot/www/config.py -index a021299..50bae4d 100644 ---- config.py 2020-02-27 13:34:10.000000000 -0800 -+++ config2.py 2020-05-11 17:26:44.587026761 -0700 -@@ -61,12 +61,12 @@ - res = {} - allowed_ext = [".html"] - try: -- import pyjade # pylint: disable=import-outside-toplevel -+ import pypugjs # pylint: disable=import-outside-toplevel - allowed_ext.append(".jade") - except ImportError: # pragma: no cover -- log.msg("pyjade not installed. Ignoring .jade files from %s" % -+ log.msg("pypugjs not installed. Ignoring .jade files from %s" % - (template_dir,)) -- pyjade = None -+ pypugjs = None - for root, dirs, files in os.walk(template_dir): - if root == template_dir: - template_name = posixpath.join("views", "%s.html") -@@ -86,9 +86,9 @@ - elif ext == ".jade": - with open(fn) as f: - jade = f.read() -- parser = pyjade.parser.Parser(jade) -+ parser = pypugjs.parser.Parser(jade) - block = parser.parse() -- compiler = pyjade.ext.html.Compiler( -+ compiler = pypugjs.ext.html.Compiler( - block, pretty=False) - html = compiler.compile() - res[template_name % (basename,)] = html -diff --git a/setup.py b/master/setup.py -index 8fca506..1f32a74 100755 ---- a/setup.py -+++ b/setup.py -@@ -490,8 +490,8 @@ test_deps = [ - # http client libraries - 'treq', - 'txrequests', -- # pyjade required for custom templates tests -- 'pyjade', -+ # pypugjs required for custom templates tests -+ 'pypugjs', - # boto3 and moto required for running EC2 tests - 'boto3', - 'moto', --- -libgit2 0.99.0 -
