[arch-commits] Commit in buildbot/trunk (PKGBUILD pygments-2.5.diff)

[Chih-Hsuan Yen]

    Date: Saturday, February 1, 2020 @ 06:48:44
  Author: yan12125
Revision: 560988

upgpkg: buildbot 2.6.0-2; add buildbot-docs

Added:
  buildbot/trunk/pygments-2.5.diff
Modified:
  buildbot/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   58 ++++++++++++++++++++++++++++++++++++----------------
 pygments-2.5.diff |   39 ++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-01 06:38:03 UTC (rev 560987)
+++ PKGBUILD	2020-02-01 06:48:44 UTC (rev 560988)
@@ -3,11 +3,12 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: William Rea <sillywilly at gmail.com>
 
-pkgname=buildbot
+pkgbase=buildbot
+pkgname=(buildbot buildbot-docs)
 pkgdesc='The Continuous Integration Framework'
 pkgver=2.6.0
 _bb_contrib_commit=ada3c8f30ca7e1b6bb260e2e5971053fbd254333
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -18,30 +19,32 @@
               python-mock python-moto python-parameterized
               python-buildbot-pkg=$pkgver buildbot-worker=$pkgver python-buildbot-www=$pkgver
               openssh git)
-makedepends=(python-setuptools git)
-optdepends=(
-  'python-boto3: for AWS EC2 latent worker'
-  'python-lz4: to compress logs using lz4'
-  'python-treq: for using HTTP requests as steps'
-  'python-txrequests: for using HTTP requests as steps'
-  'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
-  'python-docker: for Docker latent worker'
-  'pass: to use SecretInPass provider'
-  'vault: to use HashiCorpVaultSecretProvider provider'
-)
+makedepends=(python-setuptools git python-sphinx-jinja python-sphinxcontrib-blockdiag)
 source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}
-        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit")
+        "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
+        "pygments-2.5.diff")
 sha256sums=('0ac835b58db309bebcf00fa77687385551833b3dac1c66aa671d271776050c19'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '01cb9351a05cf2523e9c6c14561b2024508798902258d3b3f5caa9a6486bfc82')
 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
+}
+
 build() {
-  cd buildbot-$pkgver/master
+  cd buildbot-$pkgver
+
+  pushd master
   python setup.py build
+  popd
+
+  make docs
 }
 
 check() {
@@ -58,9 +61,30 @@
   TZ=UTC trial3 --rterrors buildbot
 }
 
-package() {
+package_buildbot() {
+  optdepends=(
+    'python-boto3: for AWS EC2 latent worker'
+    'python-lz4: to compress logs using lz4'
+    'python-treq: for using HTTP requests as steps'
+    'python-txrequests: for using HTTP requests as steps'
+    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
+    'python-docker: for Docker latent worker'
+    'pass: to use SecretInPass provider'
+    'vault: to use HashiCorpVaultSecretProvider provider'
+  )
+
   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-docs() {
+  depends=()
+
+  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
+}

Added: pygments-2.5.diff
===================================================================
--- pygments-2.5.diff	                        (rev 0)
+++ pygments-2.5.diff	2020-02-01 06:48:44 UTC (rev 560988)
@@ -0,0 +1,39 @@
+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))
+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: html+jinja
+ 
+ 
+ .. _Flask: http://flask.pocoo.org/
+diff --git a/smokes/templates/mydashboard.html b/smokes/templates/mydashboard.html
+index 75a1c02a1..ec568a314 100644
+--- a/smokes/templates/mydashboard.html
++++ b/smokes/templates/mydashboard.html
+@@ -2,7 +2,7 @@
+     <style>
+     /* only modify th from this dashboard! */
+     .mydashboard table th {
+-        font-size 24pt;
++        font-size: 24pt;
+     }
+     </style>
+     <!-- Create a table of builds organised by builders in columns -->