[arch-commits] Commit in buildbot/repos/community-any (6 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Fri Aug 28 12:25:17 UTC 2020
Date: Friday, August 28, 2020 @ 12:25:17
Author: yan12125
Revision: 690703
archrelease: copy trunk to community-any
Added:
buildbot/repos/community-any/PKGBUILD
(from rev 690701, buildbot/trunk/PKGBUILD)
buildbot/repos/community-any/ignore-setuptools-warning.diff
(from rev 690701, buildbot/trunk/ignore-setuptools-warning.diff)
buildbot/repos/community-any/reproducible-html.diff
(from rev 690701, buildbot/trunk/reproducible-html.diff)
buildbot/repos/community-any/sqlalchemy-1.13.18.diff
(from rev 690702, buildbot/trunk/sqlalchemy-1.13.18.diff)
Deleted:
buildbot/repos/community-any/PKGBUILD
buildbot/repos/community-any/reproducible-html.diff
--------------------------------+
PKGBUILD | 469 +++++++++++++++++++--------------------
ignore-setuptools-warning.diff | 12
reproducible-html.diff | 44 +--
sqlalchemy-1.13.18.diff | 13 +
4 files changed, 286 insertions(+), 252 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-28 12:25:08 UTC (rev 690702)
+++ PKGBUILD 2020-08-28 12:25:17 UTC (rev 690703)
@@ -1,230 +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.8.2
-_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"
- "reproducible-html.diff")
-sha256sums=('e5ef72bba5eee9f84f5c2df45fb6238537714c7ce9f9838418d385a3722948c9'
- 'SKIP'
- 'SKIP'
- '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 ../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
-}
Copied: buildbot/repos/community-any/PKGBUILD (from rev 690701, buildbot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-08-28 12:25:17 UTC (rev 690703)
@@ -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.8.3
+_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"
+ "reproducible-html.diff"
+ "sqlalchemy-1.13.18.diff"
+ "ignore-setuptools-warning.diff")
+sha256sums=('a8ccc3e3e6b5fa2117c827229767e57d470346a836dc713df957b3df71c3f59e'
+ 'SKIP'
+ 'SKIP'
+ 'b921d29994eff3af134ca1b37acf291a6a95f5da35a2a4f885557adcca22f864'
+ 'cd6119e8f8346ad2bcfedb3bfdbfcdcbb9908ea1db9f3ec09d323f6c9d13d9df'
+ 'd09f851fb1a50f99d407ea79fa25a90ec0f70b593983108468c87fee8b3cc476')
+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 ../reproducible-html.diff
+ patch -Np1 -i ../sqlalchemy-1.13.18.diff
+ # Setuptools 49.2.0 complains if distutils is imported earlier than setuptools
+ # The warning is still under discussion, so just ignore it for now
+ # https://github.com/pypa/setuptools/issues/2259
+ patch -Np1 -i ../ignore-setuptools-warning.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/ignore-setuptools-warning.diff (from rev 690701, buildbot/trunk/ignore-setuptools-warning.diff)
===================================================================
--- ignore-setuptools-warning.diff (rev 0)
+++ ignore-setuptools-warning.diff 2020-08-28 12:25:17 UTC (rev 690703)
@@ -0,0 +1,12 @@
+diff --git a/master/buildbot/test/__init__.py b/master/buildbot/test/__init__.py
+index f7ba7b1e7..6d4b86eab 100644
+--- a/master/buildbot/test/__init__.py
++++ b/master/buildbot/test/__init__.py
+@@ -131,3 +131,7 @@ warnings.filterwarnings('ignore', ".*Not importing directory .*/zope: missing __
+ category=ImportWarning)
+ warnings.filterwarnings('ignore', ".*Not importing directory .*/sphinxcontrib: missing __init__",
+ category=ImportWarning)
++
++# ignore warnings from setuptools 49.2.0
++warnings.filterwarnings('ignore', ".*Distutils was imported before Setuptools.*",
++ category=UserWarning)
Deleted: reproducible-html.diff
===================================================================
--- reproducible-html.diff 2020-08-28 12:25:08 UTC (rev 690702)
+++ reproducible-html.diff 2020-08-28 12:25:17 UTC (rev 690703)
@@ -1,22 +0,0 @@
---- 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/reproducible-html.diff (from rev 690701, buildbot/trunk/reproducible-html.diff)
===================================================================
--- reproducible-html.diff (rev 0)
+++ reproducible-html.diff 2020-08-28 12:25:17 UTC (rev 690703)
@@ -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/sqlalchemy-1.13.18.diff (from rev 690702, buildbot/trunk/sqlalchemy-1.13.18.diff)
===================================================================
--- sqlalchemy-1.13.18.diff (rev 0)
+++ sqlalchemy-1.13.18.diff 2020-08-28 12:25:17 UTC (rev 690703)
@@ -0,0 +1,13 @@
+diff --git a/master/buildbot/db/enginestrategy.py b/master/buildbot/db/enginestrategy.py
+index 7cd014e37..cb835602b 100644
+--- a/master/buildbot/db/enginestrategy.py
++++ b/master/buildbot/db/enginestrategy.py
+@@ -216,7 +216,7 @@ class BuildbotEngineStrategy(strategies.PlainEngineStrategy):
+ raise TypeError("Buildbot requires use_unicode=True " +
+ "(and adds it automatically)")
+ else:
+- u.query['use_unicode'] = True
++ u.query['use_unicode'] = "True"
+
+ if 'charset' in u.query:
+ if u.query['charset'] != "utf8":
More information about the arch-commits
mailing list