| 1 |
commit: 7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sat Feb 5 18:04:43 2022 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 7 20:47:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3cf9b3 |
| 7 |
|
| 8 |
dev-util/buildbot: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/24089 |
| 13 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/buildbot/files/pypugjs-2.8.0.patch | 83 ----------------------------- |
| 16 |
1 file changed, 83 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/buildbot/files/pypugjs-2.8.0.patch b/dev-util/buildbot/files/pypugjs-2.8.0.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index d34c6fac1af8..000000000000 |
| 21 |
--- a/dev-util/buildbot/files/pypugjs-2.8.0.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,83 +0,0 @@ |
| 24 |
-From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Brian Dolbec <dolsen@g.o> |
| 26 |
-Date: Sat, 25 Apr 2020 11:53:06 -0700 |
| 27 |
-Subject: [PATCH] Initial pyjade port to pypugjs |
| 28 |
- |
| 29 |
---- |
| 30 |
- common/code_spelling_ignore_words.txt | 1 + |
| 31 |
- master/buildbot/test/unit/test_www_config.py | 8 ++++---- |
| 32 |
- master/buildbot/www/config.py | 10 +++++----- |
| 33 |
- master/docs/manual/configuration/www.rst | 10 ++++++---- |
| 34 |
- master/docs/spelling_wordlist.txt | 2 +- |
| 35 |
- master/setup.py | 4 ++-- |
| 36 |
- requirements-ci.txt | 2 +- |
| 37 |
- 7 files changed, 20 insertions(+), 17 deletions(-) |
| 38 |
- |
| 39 |
-diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py |
| 40 |
-index 23a108e..a8c24ec 100644 |
| 41 |
---- a/buildbot/test/unit/test_www_config.py |
| 42 |
-+++ b/buildbot/test/unit/test_www_config.py |
| 43 |
-@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): |
| 44 |
- def test_parseCustomTemplateDir(self): |
| 45 |
- exp = {'views/builds.html': '<div>\n</div>'} |
| 46 |
- try: |
| 47 |
-- # we make the test work if pyjade is present or note |
| 48 |
-- # It is better than just skip if pyjade is not there |
| 49 |
-- import pyjade # pylint: disable=import-outside-toplevel |
| 50 |
-- [pyjade] |
| 51 |
-+ # we make the test work if pypugjs is present or note |
| 52 |
-+ # It is better than just skip if pypugjs is not there |
| 53 |
-+ import pypugjs # pylint: disable=import-outside-toplevel |
| 54 |
-+ [pypugjs] |
| 55 |
- exp.update({'plugin/views/plugin.html': |
| 56 |
- '<div class="myclass"><pre>this is customized</pre></div>'}) |
| 57 |
- except ImportError: |
| 58 |
-diff --git a/buildbot/www/config.py b/buildbot/www/config.py |
| 59 |
-index a021299..50bae4d 100644 |
| 60 |
---- config.py 2020-02-27 13:34:10.000000000 -0800 |
| 61 |
-+++ config2.py 2020-05-11 17:26:44.587026761 -0700 |
| 62 |
-@@ -61,11 +61,11 @@ |
| 63 |
- res = {} |
| 64 |
- allowed_ext = [".html"] |
| 65 |
- try: |
| 66 |
-- import pyjade # pylint: disable=import-outside-toplevel |
| 67 |
-+ import pypugjs # pylint: disable=import-outside-toplevel |
| 68 |
- allowed_ext.append(".jade") |
| 69 |
- except ImportError: # pragma: no cover |
| 70 |
-- log.msg("pyjade not installed. Ignoring .jade files from {}".format(template_dir)) |
| 71 |
-+ log.msg("pypugjs not installed. Ignoring .jade files from {}".format(template_dir)) |
| 72 |
-- pyjade = None |
| 73 |
-+ pypugjs = None |
| 74 |
- for root, dirs, files in os.walk(template_dir): |
| 75 |
- if root == template_dir: |
| 76 |
- template_name = posixpath.join("views", "%s.html") |
| 77 |
-@@ -86,9 +86,9 @@ |
| 78 |
- elif ext == ".jade": |
| 79 |
- with open(fn) as f: |
| 80 |
- jade = f.read() |
| 81 |
-- parser = pyjade.parser.Parser(jade) |
| 82 |
-+ parser = pypugjs.parser.Parser(jade) |
| 83 |
- block = parser.parse() |
| 84 |
-- compiler = pyjade.ext.html.Compiler( |
| 85 |
-+ compiler = pypugjs.ext.html.Compiler( |
| 86 |
- block, pretty=False) |
| 87 |
- html = compiler.compile() |
| 88 |
- res[template_name % (basename,)] = html |
| 89 |
-diff --git a/setup.py b/master/setup.py |
| 90 |
-index 8fca506..1f32a74 100755 |
| 91 |
---- a/setup.py |
| 92 |
-+++ b/setup.py |
| 93 |
-@@ -490,8 +490,8 @@ test_deps = [ |
| 94 |
- # http client libraries |
| 95 |
- 'treq', |
| 96 |
- 'txrequests', |
| 97 |
-- # pyjade required for custom templates tests |
| 98 |
-- 'pyjade', |
| 99 |
-+ # pypugjs required for custom templates tests |
| 100 |
-+ 'pypugjs', |
| 101 |
- # boto3 and moto required for running EC2 tests |
| 102 |
- 'boto3', |
| 103 |
- 'moto', |
| 104 |
--- |
| 105 |
-libgit2 0.99.0 |
| 106 |
- |
Archives