[arch-commits] Commit in buildbot/repos/community-any (8 files)

Chih-Hsuan Yen yan12125 at archlinux.org
Mon May 25 16:13:56 UTC 2020


    Date: Monday, May 25, 2020 @ 16:13:55
  Author: yan12125
Revision: 634637

archrelease: copy trunk to community-any

Added:
  buildbot/repos/community-any/PKGBUILD
    (from rev 634635, buildbot/trunk/PKGBUILD)
  buildbot/repos/community-any/pygments-2.5.diff
    (from rev 634635, buildbot/trunk/pygments-2.5.diff)
  buildbot/repos/community-any/reproducible-html.diff
    (from rev 634635, buildbot/trunk/reproducible-html.diff)
  buildbot/repos/community-any/sphinx-3.0.patch
    (from rev 634635, buildbot/trunk/sphinx-3.0.patch)
  buildbot/repos/community-any/sphinx-issue7139.diff
    (from rev 634635, buildbot/trunk/sphinx-issue7139.diff)
Deleted:
  buildbot/repos/community-any/PKGBUILD
  buildbot/repos/community-any/pygments-2.5.diff
  buildbot/repos/community-any/sphinx-issue7139.diff

------------------------+
 PKGBUILD               |  472 +++++++++++++++++++++++------------------------
 pygments-2.5.diff      |   26 +-
 reproducible-html.diff |   22 ++
 sphinx-3.0.patch       |  103 ++++++++++
 sphinx-issue7139.diff  |   26 +-
 5 files changed, 390 insertions(+), 259 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-25 16:13:47 UTC (rev 634636)
+++ PKGBUILD	2020-05-25 16:13:55 UTC (rev 634637)
@@ -1,233 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at gmail.com>
-# Contributor: xRemaLx <anton.komolov at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=buildbot
-pkgname=(buildbot buildbot-worker buildbot-docs
-         python-buildbot-www python-buildbot-waterfall-view
-         python-buildbot-console-view python-buildbot-grid-view
-         python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=2.7.0
-_bb_contrib_commit=ada3c8f30ca7e1b6bb260e2e5971053fbd254333
-pkgrel=1
-arch=(any)
-url='https://buildbot.net'
-license=(GPL2)
-checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
-              python-moto python-parameterized python-mock
-              openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface
-             python-sqlalchemy-migrate python-dateutil python-txaio
-             python-autobahn python-pyjwt python-yaml
-             python-setuptools python-future
-             python-sphinx-jinja python-sphinxcontrib-blockdiag
-             python-sphinx_rtd_theme
-             git yarn)
-source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
-        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
-        "pygments-2.5.diff"
-        "sphinx-issue7139.diff")
-sha256sums=('8b0ce7d332c5013517bf3bbcc70638d16c8ded8c099770bfbc8126332ff3016a'
-            'SKIP'
-            'SKIP'
-            'aab7437b4db78fd07971b875db0cdb9af4e4807ae8c0b7d5d4bae5ae03074ec2'
-            '44753dd07bef78105528d371a053594fd7a24922e23a2841d67ff44c764224b6')
-validpgpkeys=(
-  '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
-  'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
-)
-
-prepare() {
-  cd buildbot-$pkgver
-  patch -Np1 -i ../pygments-2.5.diff
-  patch -Np1 -i ../sphinx-issue7139.diff
-
-  # HACK: do not use virtualenv
-  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
-
-  # HACK: Do not build JS again during install
-  # We take care about the command order manually
-  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
-
-  sed -i '/buildbot_windows_service/d' master/setup.py
-  rm -v master/buildbot/scripts/windows_service.py
-  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
-  rm -v worker/buildbot_worker/scripts/windows_service.py
-}
-
-build() {
-  export NODE_OPTIONS="--max-old-space-size=2048"
-
-  cd "$srcdir"/buildbot-$pkgver/pkg
-  python setup.py egg_info
-
-  #################### buildbot ####################
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py build
-
-  #################### buildbot-worker ####################
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py build
-
-  #################### buildbot-www ####################
-  cd "$srcdir"/buildbot-$pkgver
-
-  # HACK: use system packages instead of ones via pip
-  make PIP=/usr/bin/true frontend_deps
-
-  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
-  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    python setup.py build
-  done
-
-  #################### buildbot-docs ####################
-  cd "$srcdir/buildbot-$pkgver"
-  make docs
-}
-
-check() {
-  # Install packages to a temp folder for tests
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py egg_info
-  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py egg_info
-
-  cd "$srcdir"/buildbot-$pkgver/www/base
-  python setup.py egg_info
-
-  # Run tests
-  _basedir="$srcdir/buildbot-$pkgver"
-  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
-  export PATH="$PATH:$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial3 --rterrors buildbot
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  PYTHONPATH=. trial3 buildbot_worker
-
-  for module in base waterfall_view console_view grid_view wsgi_dashboards
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
-  done
-}
-
-package_buildbot() {
-  pkgdesc='The Continuous Integration Framework'
-  depends=(python-twisted python-jinja python-zope-interface
-           python-sqlalchemy-migrate python-dateutil python-txaio
-           python-autobahn python-pyjwt python-yaml)
-  optdepends=(
-    # reporters
-    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
-    # secrets
-    'pass: to use SecretInPass provider'
-    'vault: to use HashiCorpVaultSecretProvider provider'
-    # statistics
-    'python-influxdb: for using InfluxDB to store statistics'
-    # steps
-    'python-subunit: for SubunitShellCommand'
-    'python-treq: for using HTTP requests as steps'
-    'python-txrequests: for using HTTP requests as steps'
-    # workers
-    'buildbot-worker: for local worker'
-    'libvirt-python: for libvirt worker'
-    'python-boto3: for AWS EC2 latent worker'
-    'python-docker: for Docker latent worker'
-    'python-novaclient: for OpenStack latent worker'
-    # www
-    'python-ldap3: to authenticate users via LDAP'
-
-    # misc
-    'python-lz4: to compress logs using lz4'
-  )
-
-  cd buildbot-$pkgver/master
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-worker() {
-  pkgdesc='Buildbot worker daemon'
-  depends=(python-setuptools python-twisted python-future)
-
-  cd buildbot-$pkgver/worker
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-docs() {
-  pkgdesc='Buildbot docs'
-
-  cd buildbot-$pkgver/master/docs
-  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
-  for kind in html singlehtml ; do
-    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
-  done
-}
-
-package_python-buildbot-www() {
-  pkgdesc='Buildbot UI'
-  depends=(python buildbot)
-  optdepends=(
-    'python-buildbot-waterfall-view'
-    'python-buildbot-console-view'
-    'python-buildbot-grid-view'
-    'python-buildbot-badges'
-  )
-
-  cd buildbot-$pkgver/www/base
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-waterfall-view() {
-  pkgdesc='Buildbot Waterfall View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/waterfall_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-console-view() {
-  pkgdesc='Buildbot Console View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/console_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-grid-view() {
-  pkgdesc='Buildbot Grid View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/grid_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-wsgi-dashboards() {
-  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/wsgi_dashboards
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-badges() {
-  pkgdesc='Buildbot badges'
-  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
-  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
-  optdepends=(
-    'ttf-dejavu: the default font for rendering badges as PNGs'
-  )
-
-  cd buildbot-$pkgver/www/badges
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}

Copied: buildbot/repos/community-any/PKGBUILD (from rev 634635, buildbot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-25 16:13:55 UTC (rev 634637)
@@ -0,0 +1,239 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at gmail.com>
+# Contributor: xRemaLx <anton.komolov at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=buildbot
+pkgname=(buildbot buildbot-worker buildbot-docs
+         python-buildbot-www python-buildbot-waterfall-view
+         python-buildbot-console-view python-buildbot-grid-view
+         python-buildbot-wsgi-dashboards python-buildbot-badges)
+pkgver=2.7.0
+_bb_contrib_commit=ada3c8f30ca7e1b6bb260e2e5971053fbd254333
+pkgrel=2
+arch=(any)
+url='https://buildbot.net'
+license=(GPL2)
+checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
+              python-moto python-parameterized python-mock
+              openssh chromium)
+makedepends=(python-twisted python-jinja python-zope-interface
+             python-sqlalchemy-migrate python-dateutil python-txaio
+             python-autobahn python-pyjwt python-yaml
+             python-setuptools python-future
+             python-sphinx-jinja python-sphinxcontrib-blockdiag
+             python-sphinx_rtd_theme
+             git yarn)
+source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
+        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
+        "pygments-2.5.diff"
+        "sphinx-issue7139.diff"
+        "sphinx-3.0.patch"
+        "reproducible-html.diff")
+sha256sums=('8b0ce7d332c5013517bf3bbcc70638d16c8ded8c099770bfbc8126332ff3016a'
+            'SKIP'
+            'SKIP'
+            'aab7437b4db78fd07971b875db0cdb9af4e4807ae8c0b7d5d4bae5ae03074ec2'
+            '44753dd07bef78105528d371a053594fd7a24922e23a2841d67ff44c764224b6'
+            '148410975575748984de7ae7d013135899bc522a56b7b678df3ac9bb55321f6f'
+            'b921d29994eff3af134ca1b37acf291a6a95f5da35a2a4f885557adcca22f864')
+validpgpkeys=(
+  '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
+  'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
+)
+
+prepare() {
+  cd buildbot-$pkgver
+  patch -Np1 -i ../pygments-2.5.diff
+  patch -Np1 -i ../sphinx-issue7139.diff
+  patch -Np1 -i ../sphinx-3.0.patch
+  patch -Np1 -i ../reproducible-html.diff
+
+  # HACK: do not use virtualenv
+  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
+
+  # HACK: Do not build JS again during install
+  # We take care about the command order manually
+  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
+
+  sed -i '/buildbot_windows_service/d' master/setup.py
+  rm -v master/buildbot/scripts/windows_service.py
+  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
+  rm -v worker/buildbot_worker/scripts/windows_service.py
+}
+
+build() {
+  export NODE_OPTIONS="--max-old-space-size=2048"
+
+  cd "$srcdir"/buildbot-$pkgver/pkg
+  python setup.py egg_info
+
+  #################### buildbot ####################
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py build
+
+  #################### buildbot-worker ####################
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py build
+
+  #################### buildbot-www ####################
+  cd "$srcdir"/buildbot-$pkgver
+
+  # HACK: use system packages instead of ones via pip
+  make PIP=/usr/bin/true frontend_deps
+
+  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
+  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    python setup.py build
+  done
+
+  #################### buildbot-docs ####################
+  cd "$srcdir/buildbot-$pkgver"
+  make docs
+}
+
+check() {
+  # Install packages to a temp folder for tests
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py egg_info
+  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py egg_info
+
+  cd "$srcdir"/buildbot-$pkgver/www/base
+  python setup.py egg_info
+
+  # Run tests
+  _basedir="$srcdir/buildbot-$pkgver"
+  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
+  export PATH="$PATH:$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/master
+  TZ=UTC trial3 --rterrors buildbot
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  PYTHONPATH=. trial3 buildbot_worker
+
+  for module in base waterfall_view console_view grid_view wsgi_dashboards
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
+  done
+}
+
+package_buildbot() {
+  pkgdesc='The Continuous Integration Framework'
+  depends=(python-twisted python-jinja python-zope-interface
+           python-sqlalchemy-migrate python-dateutil python-txaio
+           python-autobahn python-pyjwt python-yaml)
+  optdepends=(
+    # reporters
+    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
+    # secrets
+    'pass: to use SecretInPass provider'
+    'vault: to use HashiCorpVaultSecretProvider provider'
+    # statistics
+    'python-influxdb: for using InfluxDB to store statistics'
+    # steps
+    'python-subunit: for SubunitShellCommand'
+    'python-treq: for using HTTP requests as steps'
+    'python-txrequests: for using HTTP requests as steps'
+    # workers
+    'buildbot-worker: for local worker'
+    'libvirt-python: for libvirt worker'
+    'python-boto3: for AWS EC2 latent worker'
+    'python-docker: for Docker latent worker'
+    'python-novaclient: for OpenStack latent worker'
+    # www
+    'python-ldap3: to authenticate users via LDAP'
+
+    # misc
+    'python-lz4: to compress logs using lz4'
+  )
+
+  cd buildbot-$pkgver/master
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-worker() {
+  pkgdesc='Buildbot worker daemon'
+  depends=(python-setuptools python-twisted python-future)
+
+  cd buildbot-$pkgver/worker
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-docs() {
+  pkgdesc='Buildbot docs'
+
+  cd buildbot-$pkgver/master/docs
+  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
+  for kind in html singlehtml ; do
+    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
+  done
+}
+
+package_python-buildbot-www() {
+  pkgdesc='Buildbot UI'
+  depends=(python buildbot)
+  optdepends=(
+    'python-buildbot-waterfall-view'
+    'python-buildbot-console-view'
+    'python-buildbot-grid-view'
+    'python-buildbot-badges'
+  )
+
+  cd buildbot-$pkgver/www/base
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-waterfall-view() {
+  pkgdesc='Buildbot Waterfall View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/waterfall_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-console-view() {
+  pkgdesc='Buildbot Console View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/console_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-grid-view() {
+  pkgdesc='Buildbot Grid View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/grid_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-wsgi-dashboards() {
+  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/wsgi_dashboards
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-badges() {
+  pkgdesc='Buildbot badges'
+  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
+  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
+  optdepends=(
+    'ttf-dejavu: the default font for rendering badges as PNGs'
+  )
+
+  cd buildbot-$pkgver/www/badges
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}

Deleted: pygments-2.5.diff
===================================================================
--- pygments-2.5.diff	2020-05-25 16:13:47 UTC (rev 634636)
+++ pygments-2.5.diff	2020-05-25 16:13:55 UTC (rev 634637)
@@ -1,13 +0,0 @@
-diff --git a/master/docs/manual/configuration/schedulers.rst b/master/docs/manual/configuration/schedulers.rst
-index d4b667afe..51bd25321 100644
---- a/master/docs/manual/configuration/schedulers.rst
-+++ b/master/docs/manual/configuration/schedulers.rst
-@@ -678,7 +678,7 @@ This scheduler will perform a build each Monday morning at 6:23am and again at 8
- 
-     c['schedulers'].append(
-         schedulers.Nightly(name='BeforeWork',
--                           branch=`default`,
-+                           branch='default',
-                            builderNames=['builder1'],
-                            dayOfWeek=0, hour=[6,8], minute=23,
-                            onlyIfChanged=True))

Copied: buildbot/repos/community-any/pygments-2.5.diff (from rev 634635, buildbot/trunk/pygments-2.5.diff)
===================================================================
--- pygments-2.5.diff	                        (rev 0)
+++ pygments-2.5.diff	2020-05-25 16:13:55 UTC (rev 634637)
@@ -0,0 +1,13 @@
+diff --git a/master/docs/manual/configuration/schedulers.rst b/master/docs/manual/configuration/schedulers.rst
+index d4b667afe..51bd25321 100644
+--- a/master/docs/manual/configuration/schedulers.rst
++++ b/master/docs/manual/configuration/schedulers.rst
+@@ -678,7 +678,7 @@ This scheduler will perform a build each Monday morning at 6:23am and again at 8
+ 
+     c['schedulers'].append(
+         schedulers.Nightly(name='BeforeWork',
+-                           branch=`default`,
++                           branch='default',
+                            builderNames=['builder1'],
+                            dayOfWeek=0, hour=[6,8], minute=23,
+                            onlyIfChanged=True))

Copied: buildbot/repos/community-any/reproducible-html.diff (from rev 634635, buildbot/trunk/reproducible-html.diff)
===================================================================
--- reproducible-html.diff	                        (rev 0)
+++ reproducible-html.diff	2020-05-25 16:13:55 UTC (rev 634637)
@@ -0,0 +1,22 @@
+--- a/www/base/src/app/layout.jade	2020-02-28 05:30:40.000000000 +0800
++++ b/www/base/src/app/layout.jade	2020-05-24 22:01:39.401819550 +0800
+@@ -1,3 +1,5 @@
++- var timestamp = process.env.SOURCE_DATE_EPOCH ? (parseInt(process.env.SOURCE_DATE_EPOCH) * 1000) : new Date().getTime();
++
+ doctype html
+ html.no-js(ng-app="app", xmlns:ng='http://angularjs.org', xmlns:app='ignored')
+     head
+@@ -18,10 +20,10 @@
+     script(src="browser-warning-list.js")
+     script
+       | window.T =  {{ custom_templates | tojson }};
+-    script(src="scripts.js?_" + (new Date()).getTime())
++    script(src="scripts.js?_" + timestamp)
+     | {% for app in config.plugins -%}
+-    script(src="{{app}}/scripts.js?_" + (new Date()).getTime())
+-    link(href='{{app}}/styles.css?_' + (new Date()).getTime(), rel='stylesheet')
++    script(src="{{app}}/scripts.js?_" + timestamp)
++    link(href='{{app}}/styles.css?_' + timestamp, rel='stylesheet')
+     script
+       | angular.module('app').requires.push('{{app}}')
+     | {% endfor %}

Copied: buildbot/repos/community-any/sphinx-3.0.patch (from rev 634635, buildbot/trunk/sphinx-3.0.patch)
===================================================================
--- sphinx-3.0.patch	                        (rev 0)
+++ sphinx-3.0.patch	2020-05-25 16:13:55 UTC (rev 634637)
@@ -0,0 +1,103 @@
+From 16fc5f43358e9790f325e1c6abdc5defc2d58832 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125 at gmail.com>
+Date: Wed, 8 Apr 2020 20:22:36 +0800
+Subject: [PATCH] Fixing building docs with Sphinx 3.0
+
+1. Remove the bbdocs.highlighterrors extension, which is incompatible with
+   Sphinx 3.0, where sphinx.highlighting.PygmentsBridge.unhighlighted()
+   is removed. Actually that extension appears to be unused all the time.
+   When that module is added [1], Sphinx 1.3.3 is used [2], while calls
+   to PygmentsBridge.unhighlighted() had been gradually removed in Sphinx
+   1.2 [3] and 1.3 [4].
+2. Fix duplicate names in docs. Two of them are caused by incorrect
+   function/class name, and others are by same class names in different
+   Python modules with missing py:module declarations.
+3. Bump the Sphinx version
+
+[1] https://github.com/buildbot/buildbot/commit/b3292b136a9bce478aacc36b2462e922d5575e93
+[2] https://github.com/buildbot/buildbot/blob/b3292b136a9bce478aacc36b2462e922d5575e93/.travis.yml#L127
+[3] https://github.com/sphinx-doc/sphinx/commit/b29226a0609d5803afd51c01f6d522bd30592dbf
+[4] https://github.com/sphinx-doc/sphinx/commit/db1cf80a69778d882f5c39b8966dc9fd5af256ac
+---
+ .../newsfragments/update-sphinx-3.doc         |  1 +
+ master/docs/bbdocs/highlighterrors.py         | 96 -------------------
+ master/docs/conf.py                           |  1 -
+ master/docs/developer/utils.rst               |  8 +-
+ .../docs/manual/configuration/buildsteps.rst  |  2 +-
+ requirements-cidocs.txt                       |  2 +-
+ 6 files changed, 10 insertions(+), 100 deletions(-)
+ create mode 100644 master/buildbot/newsfragments/update-sphinx-3.doc
+ delete mode 100644 master/docs/bbdocs/highlighterrors.py
+
+diff --git a/master/buildbot/newsfragments/update-sphinx-3.doc b/master/buildbot/newsfragments/update-sphinx-3.doc
+new file mode 100644
+index 0000000000..aa7accbaab
+--- /dev/null
++++ b/master/buildbot/newsfragments/update-sphinx-3.doc
+@@ -0,0 +1 @@
++Make docs build with Sphinx 3 and fix some typos and incorrect Python module declarations
+diff --git a/master/docs/conf.py b/master/docs/conf.py
+index 2e340b5a44..bc3738f9ce 100755
+--- a/master/docs/conf.py
++++ b/master/docs/conf.py
+@@ -56,7 +56,6 @@
+     'sphinx.ext.todo',
+     'sphinx.ext.extlinks',
+     'bbdocs.ext',
+-    'bbdocs.highlighterrors',
+     'sphinxcontrib.blockdiag',
+     'sphinxcontrib.jinja',
+     'sphinx_rtd_theme',
+diff --git a/master/docs/developer/utils.rst b/master/docs/developer/utils.rst
+index adc0cb2981..0c968ff133 100644
+--- a/master/docs/developer/utils.rst
++++ b/master/docs/developer/utils.rst
+@@ -789,7 +789,7 @@ The classes in the :py:mod:`buildbot.util.subscription` module are used for deal
+ 
+         Get a named state value from the object's state.
+ 
+-    .. py:method:: getState(name, value)
++    .. py:method:: setState(name, value)
+ 
+         :param name: the name of the value to change
+         :param value: the value to set - must be a JSONable object
+@@ -1143,6 +1143,8 @@ For example, a particular daily scheduler could be configured on multiple master
+ :py:mod:`buildbot.util.httpclientservice`
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
++.. py:module:: buildbot.util.httpclientservice
++
+ .. py:class:: HTTPClientService
+ 
+     This class implements a SharedService for doing http client access.
+@@ -1257,6 +1259,8 @@ For example, a particular daily scheduler could be configured on multiple master
+ :py:mod:`buildbot.test.fake.httpclientservice`
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
++.. py:module:: buildbot.test.fake.httpclientservice
++
+ .. py:class:: HTTPClientService
+ 
+     This class implements a fake version of the :class:`buildbot.util.httpclientservice.HTTPClientService` that needs to be used for testing services which needs http client access.
+@@ -1353,6 +1357,8 @@ For example, a particular daily scheduler could be configured on multiple master
+ :py:mod:`buildbot.util.ssl`
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
++.. py:module:: buildbot.util.ssl
++
+ This module is a copy of :py:mod:`twisted.internet.ssl` except it won't crash with :py:class:`ImportError` if :py:mod:`pyopenssl` is not installed.
+ If you need to use :py:mod:`twisted.internet.ssl`, please instead use :py:mod:`buildbot.util.ssl`, and call :py:func:`ssl.ensureHasSSL` in :py:meth:`checkConfig` to provide helpful message to the user, only if he enabled SSL for your plugin.
+ 
+diff --git a/master/docs/manual/configuration/buildsteps.rst b/master/docs/manual/configuration/buildsteps.rst
+index b4b45cb21d..c25ffe31d0 100644
+--- a/master/docs/manual/configuration/buildsteps.rst
++++ b/master/docs/manual/configuration/buildsteps.rst
+@@ -2658,7 +2658,7 @@ It is usually called with the ``value`` argument being specified as a :ref:`Inte
+ :class:`SetProperties` step
+ +++++++++++++++++++++++++++
+ 
+-.. py:class:: buildbot.steps.master.SetProperty
++.. py:class:: buildbot.steps.master.SetProperties
+ 
+ :bb:step:`SetProperties` takes a dictionary to be turned into build properties.
+ 

Deleted: sphinx-issue7139.diff
===================================================================
--- sphinx-issue7139.diff	2020-05-25 16:13:47 UTC (rev 634636)
+++ sphinx-issue7139.diff	2020-05-25 16:13:55 UTC (rev 634637)
@@ -1,13 +0,0 @@
-diff --git a/master/docs/manual/customization.rst b/master/docs/manual/customization.rst
-index df0b14554..0ac854733 100644
---- a/master/docs/manual/customization.rst
-+++ b/master/docs/manual/customization.rst
-@@ -1252,7 +1252,7 @@ Then you need a ``templates/mydashboard.html`` file near your ``master.cfg``.
- This template is a standard Jinja_ template which is the default templating engine of Flask_.
- 
- .. literalinclude:: mydashboard.html
--   :language: guess
-+   :language: xml+django
- 
- 
- .. _Flask: http://flask.pocoo.org/

Copied: buildbot/repos/community-any/sphinx-issue7139.diff (from rev 634635, buildbot/trunk/sphinx-issue7139.diff)
===================================================================
--- sphinx-issue7139.diff	                        (rev 0)
+++ sphinx-issue7139.diff	2020-05-25 16:13:55 UTC (rev 634637)
@@ -0,0 +1,13 @@
+diff --git a/master/docs/manual/customization.rst b/master/docs/manual/customization.rst
+index df0b14554..0ac854733 100644
+--- a/master/docs/manual/customization.rst
++++ b/master/docs/manual/customization.rst
+@@ -1252,7 +1252,7 @@ Then you need a ``templates/mydashboard.html`` file near your ``master.cfg``.
+ This template is a standard Jinja_ template which is the default templating engine of Flask_.
+ 
+ .. literalinclude:: mydashboard.html
+-   :language: guess
++   :language: xml+django
+ 
+ 
+ .. _Flask: http://flask.pocoo.org/


More information about the arch-commits mailing list