* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2016-08-10 17:18 Brian Dolbec
0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2016-08-10 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 21bbdcbf32a5856ec678a544044b43b3a6e449f0
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 16:50:07 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 17:17:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bbdcbf
dev-util/buildbot: Fix typo in files/buildbot9.service filename bug 590958
Package-Manager: portage-2.3.0
dev-util/buildbot/files/{buildbot9..service => buildbot9.service} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-util/buildbot/files/buildbot9..service b/dev-util/buildbot/files/buildbot9.service
similarity index 100%
rename from dev-util/buildbot/files/buildbot9..service
rename to dev-util/buildbot/files/buildbot9.service
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2017-11-04 7:25 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2017-11-04 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 1ba78e912b9035f74dc56d024f24b743db5b0ce4
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Oct 30 18:58:08 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 4 07:25:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba78e91
dev-util/buildbot: remove unused patch/file
dev-util/buildbot/files/buildbot-0.9.4.docs.patch | 130 ----------------------
dev-util/buildbot/files/buildbot.service | 16 ---
2 files changed, 146 deletions(-)
diff --git a/dev-util/buildbot/files/buildbot-0.9.4.docs.patch b/dev-util/buildbot/files/buildbot-0.9.4.docs.patch
deleted file mode 100644
index 1a27713cb93..00000000000
--- a/dev-util/buildbot/files/buildbot-0.9.4.docs.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/docs/Makefile b/docs/Makefile
-index 55637302d..c4fde481e 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -24,7 +24,7 @@ PAPEROPT_a4 = -D latex_paper_size=a4
- PAPEROPT_letter = -D latex_paper_size=letter
- ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
--.PHONY: help clean towncrier html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
- help:
- @echo "Please use \`make <target>' where <target> is one of"
-@@ -51,38 +51,38 @@ clean:
- towncrier:
- cd ../../; towncrier --draft |grep 'No significant changes.' || yes n | towncrier
-
--html: conf.py towncrier
-+html: conf.py
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
--dirhtml: conf.py towncrier
-+dirhtml: conf.py
- $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
--singlehtml: conf.py towncrier
-+singlehtml: conf.py
- $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
- @echo
- @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
--pickle: conf.py towncrier
-+pickle: conf.py
- $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
- @echo
- @echo "Build finished; now you can process the pickle files."
-
--json: conf.py towncrier
-+json: conf.py
- $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
- @echo
- @echo "Build finished; now you can process the JSON files."
-
--htmlhelp: conf.py towncrier
-+htmlhelp: conf.py
- $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
- @echo
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in $(BUILDDIR)/htmlhelp."
-
--qthelp: conf.py towncrier
-+qthelp: conf.py
- $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
- @echo
- @echo "Build finished; now you can run "qcollectiongenerator" with the" \
-@@ -91,7 +91,7 @@ qthelp: conf.py towncrier
- @echo "To view the help file:"
- @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/BuildbotTutorial.qhc"
-
--devhelp: conf.py towncrier
-+devhelp: conf.py
- $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
- @echo
- @echo "Build finished."
-@@ -100,52 +100,52 @@ devhelp: conf.py towncrier
- @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/BuildbotTutorial"
- @echo "# devhelp"
-
--epub: conf.py towncrier
-+epub: conf.py
- $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
- @echo
- @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
--latex: conf.py towncrier
-+latex: conf.py
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- @echo
- @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
- @echo "Run \`make' in that directory to run these through (pdf)latex" \
- "(use \`make latexpdf' here to do that automatically)."
-
--latexpdf: conf.py towncrier
-+latexpdf: conf.py
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- @echo "Running LaTeX files through pdflatex..."
- make -C $(BUILDDIR)/latex all-pdf
- @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
--text: conf.py towncrier
-+text: conf.py
- $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
- @echo
- @echo "Build finished. The text files are in $(BUILDDIR)/text."
-
--man: conf.py towncrier
-+man: conf.py
- $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
- @echo
- @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
--changes: conf.py towncrier
-+changes: conf.py
- $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
- @echo
- @echo "The overview file is in $(BUILDDIR)/changes."
-
--linkcheck: conf.py towncrier
-+linkcheck: conf.py
- $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
- @echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in $(BUILDDIR)/linkcheck/output.txt."
-
--spelling: conf.py towncrier
-+spelling: conf.py
- $(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
- @echo
- @echo "Spelling check complete; look for any errors in the above output " \
- "or in $(BUILDDIR)/spelling/output.txt."
-
--doctest: conf.py towncrier
-+doctest: conf.py
- $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/dev-util/buildbot/files/buildbot.service b/dev-util/buildbot/files/buildbot.service
deleted file mode 100644
index 4581a13a0c4..00000000000
--- a/dev-util/buildbot/files/buildbot.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=buildbot master daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-WorkingDirectory=/var/lib/buildmaster
-# The following assume there is a 'master' directory
-# in $WorkingDirectory with the master configuration files
-ExecStartPre=/usr/bin/buildbot checkconfig master
-ExecStart=/usr/bin/buildbot start master
-ExecStop=/usr/bin/buildbot stop master
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2018-07-26 18:14 Brian Dolbec
0 siblings, 0 replies; 8+ messages in thread
From: Brian Dolbec @ 2018-07-26 18:14 UTC (permalink / raw
To: gentoo-commits
commit: d32fc9a088a1abd9c6f9462822c3f5aac80f061f
Author: Brian Dolbec dolsen <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 26 18:14:24 2018 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 26 18:14:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32fc9a0
dev-util/buildbot: Fix missed checkconfig section bug 661618
Adds RUNTIME_PYTHON default setting to the init.d script
Gentoo-bug: https://bugs.gentoo.org/661618
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-util/buildbot/files/buildmaster.initd | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index 933c6e2b4e5..b75ae34830d 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -32,6 +32,9 @@ checkconfig() {
eerror "${BUILDMASTER_PATH} does not contain buildbot.tac"
return 1
fi
+ if [ ! -e "${RUNTIME_PYTHON}" ]; then
+ RUNTIME_PYTHON="/usr/bin/python"
+ fi
}
start() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2019-02-27 5:35 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2019-02-27 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 06a5475f28a79c335d45c2afc8f89779161c83ac
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Feb 18 17:33:50 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 05:35:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a5475f
dev-util/buildbot: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11098
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
...uildbot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 ----------------------
.../files/disable-test_userpass_wait.patch | 24 ----------------
2 files changed, 56 deletions(-)
diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
deleted file mode 100644
index db08d7a45dd..00000000000
--- a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 15 Jan 2018 13:50:36 -0800
-Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker
- is not installed
-
-This fixes numerous tracebacks (note, only partial traceback):
-
- File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance
- if docker_py_version >= 2.2:
-builtins.NameError: name 'docker_py_version' is not defined
-
-With this patch, the tests pass.
----
- master/buildbot/worker/docker.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py
-index 62e30785f..e558d69ff 100644
---- a/buildbot/worker/docker.py
-+++ b/buildbot/worker/docker.py
-@@ -41,6 +41,7 @@ try:
- except ImportError:
- docker = None
- client = None
-+ docker_py_version = 0.0
-
-
- def _handle_stream_line(line):
---
-2.15.1
-
diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch
deleted file mode 100644
index e7b9d0a59e3..00000000000
--- a/dev-util/buildbot/files/disable-test_userpass_wait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Tue, 13 Mar 2018 19:59:13 +0000
-Subject: [PATCH] disable test-userpass-wait
-
----
- master/buildbot/test/integration/test_try_client.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py
-index 9bdc7a63a..48fcb1573 100644
---- a/buildbot/test/integration/test_try_client.py
-+++ b/buildbot/test/integration/test_try_client.py
-@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin):
-
- @defer.inlineCallbacks
- def test_userpass_wait(self):
-+ if os.environ.get("DISABLE_TEST", False):
-+ return
- yield self.startMaster(
- trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')]))
- yield self.runClient({
---
-2.13.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2020-06-15 16:39 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2020-06-15 16:39 UTC (permalink / raw
To: gentoo-commits
commit: a08bdbf3456e2f708b81bc258fe06400a8508c1e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 12:57:58 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 16:39:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08bdbf3
dev-util/buildbot: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16251
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../buildbot/files/Remove-distro-version-test.patch | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch
deleted file mode 100644
index c489be25c1c..00000000000
--- a/dev-util/buildbot/files/Remove-distro-version-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Thu, 26 Oct 2017 12:00:37 -0700
-Subject: [PATCH] Remove distro version test
-
----
- buildbot/test/unit/test_buildbot_net_usage_data.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py
-index 709c804..7885d1b 100644
---- a/buildbot/test/unit/test_buildbot_net_usage_data.py
-+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
-@@ -153,4 +153,3 @@ class Tests(unittest.TestCase):
- distro = linux_distribution()
- self.assertEqual(len(distro), 2)
- self.assertNotIn("unknown", distro[0])
-- self.assertNotIn("unknown", distro[1])
---
-libgit2 0.26.0
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2020-09-20 14:41 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2020-09-20 14:41 UTC (permalink / raw
To: gentoo-commits
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 <dolsen@gentoo.org>
-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 <dolsen@gentoo.org>
----
- 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 <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,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
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2022-02-07 20:47 Arthur Zamarin
0 siblings, 0 replies; 8+ messages in thread
From: Arthur Zamarin @ 2022-02-07 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 7d3cf9b344c8ec7a4eb30d3c61ac777c04e6706f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 5 18:04:43 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 7 20:47:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3cf9b3
dev-util/buildbot: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24089
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-util/buildbot/files/pypugjs-2.8.0.patch | 83 -----------------------------
1 file changed, 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
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/
@ 2024-02-17 14:35 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2024-02-17 14:35 UTC (permalink / raw
To: gentoo-commits
commit: a209cd6431bf38f2a93ed92fdb159e7b5a628b97
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:16 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a209cd64
dev-util/buildbot: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/buildbot-3.11.0-importlib.resources.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/dev-util/buildbot/files/buildbot-3.11.0-importlib.resources.patch b/dev-util/buildbot/files/buildbot-3.11.0-importlib.resources.patch
deleted file mode 100644
index 3854b93fe4b8..000000000000
--- a/dev-util/buildbot/files/buildbot-3.11.0-importlib.resources.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/buildbot/buildbot/pull/7270
-We don't use older python then 3.10 so use importlib.resources
---- a/buildbot/www/plugin.py 2023-12-27 11:18:13.107479017 +0100
-+++ b/buildbot/www/plugin.py 2023-12-27 11:20:55.710106750 +0100
-@@ -14,7 +14,7 @@
- # Copyright Buildbot Team Members
-
-
--import importlib_resources
-+import importlib.resources as importlib_resources
-
- from twisted.web import static
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-02-17 14:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-10 17:18 [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2017-11-04 7:25 Michael Palimaka
2018-07-26 18:14 Brian Dolbec
2019-02-27 5:35 Aaron Bauman
2020-06-15 16:39 Aaron Bauman
2020-09-20 14:41 Conrad Kostecki
2022-02-07 20:47 Arthur Zamarin
2024-02-17 14:35 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox