summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-02-05 19:04:43 +0100
committerArthur Zamarin <arthurzam@gentoo.org>2022-02-07 22:47:42 +0200
commit7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f (patch)
treed704113f2c5cdd44b37290cd46c2ae30012f81ec /dev-util/buildbot
parentprofiles: Mask sci-libs/oce (diff)
downloadgentoo-7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f.tar.gz
gentoo-7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f.tar.bz2
gentoo-7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f.zip
dev-util/buildbot: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/24089 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-util/buildbot')
-rw-r--r--dev-util/buildbot/files/pypugjs-2.8.0.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/dev-util/buildbot/files/pypugjs-2.8.0.patch b/dev-util/buildbot/files/pypugjs-2.8.0.patch
deleted file mode 100644
index d34c6fac1af8..000000000000
--- a/dev-util/buildbot/files/pypugjs-2.8.0.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-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,11 +61,11 @@
- 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 {}".format(template_dir))
-+ log.msg("pypugjs not installed. Ignoring .jade files from {}".format(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
-