From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- ...-gentoo-to-the-VERSION_ID-check-exclusion.patch | 26 +++++++ dev-util/buildbot/files/pypugjs.patch | 84 ++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch create mode 100644 dev-util/buildbot/files/pypugjs.patch (limited to 'dev-util/buildbot/files') 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 new file mode 100644 index 000000000000..16fc0a133e10 --- /dev/null +++ b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch @@ -0,0 +1,26 @@ +From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +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 +--- + 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/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch new file mode 100644 index 000000000000..3ac99502b5d5 --- /dev/null +++ b/dev-util/buildbot/files/pypugjs.patch @@ -0,0 +1,84 @@ +From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +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': '
\n
'} + 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': + '
this is customized
'}) + 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 + -- cgit v1.2.3