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

Chih-Hsuan Yen yan12125 at archlinux.org
Sat Feb 1 19:09:52 UTC 2020


    Date: Saturday, February 1, 2020 @ 19:09:51
  Author: yan12125
Revision: 561097

archrelease: copy trunk to community-any

Added:
  buildbot/repos/community-any/PKGBUILD
    (from rev 561096, buildbot/trunk/PKGBUILD)
  buildbot/repos/community-any/pygments-2.5.diff
    (from rev 561096, buildbot/trunk/pygments-2.5.diff)
Deleted:
  buildbot/repos/community-any/PKGBUILD
  buildbot/repos/community-any/pygments-2.5.diff

-------------------+
 PKGBUILD          |  448 ++++++++++++++++++++++++++--------------------------
 pygments-2.5.diff |   78 ++++-----
 2 files changed, 271 insertions(+), 255 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-01 19:09:30 UTC (rev 561096)
+++ PKGBUILD	2020-02-01 19:09:51 UTC (rev 561097)
@@ -1,216 +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-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.6.0
-_bb_contrib_commit=ada3c8f30ca7e1b6bb260e2e5971053fbd254333
-pkgrel=3
-arch=(any)
-url='https://buildbot.net'
-license=(GPL2)
-checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
-              python-moto python-parameterized
-              buildbot-worker=$pkgver
-              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-mock
-             python-sphinx-jinja python-sphinxcontrib-blockdiag
-             git yarn)
-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"
-        "https://github.com/yan12125/buildbot/commit/26af545b3f8cbf97f2335e61b08dcf30f447c17b.patch"
-        "pygments-2.5.diff")
-sha256sums=('0ac835b58db309bebcf00fa77687385551833b3dac1c66aa671d271776050c19'
-            'SKIP'
-            'SKIP'
-            '4bf518b614aa208152fb88e39325a8f5b5a681ee91e9033728f2bb20a7704611'
-            '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
-  patch -Np1 -i ../26af545b3f8cbf97f2335e61b08dcf30f447c17b.patch
-
-  # 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
-}
-
-build() {
-  export NODE_OPTIONS="--max-old-space-size=2048"
-
-  site_packages_path=$(python -c 'import site; print(site.getsitepackages()[0])')
-
-  cd "$srcdir"/buildbot-$pkgver/pkg
-  python setup.py install --root="$srcdir"/tmp_install
-
-  #################### buildbot ####################
-  cd "$srcdir"/buildbot-$pkgver/master
-  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"/tmp_install$site_packages_path
-  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
-
-  site_packages_path=$(python -c 'import site; print(site.getsitepackages()[0])')
-
-  python setup.py install --root="$srcdir"/tmp_install --skip-build
-  # Copy files over for integration tests
-  cp -v buildbot/test/integration/*.tgz "$srcdir"/tmp_install$site_packages_path/buildbot/test/integration/
-
-  cd "$srcdir"/buildbot-$pkgver/www/base
-  python setup.py install --root="$srcdir"/tmp_install --skip-build
-
-  # Run tests
-  export PYTHONPATH="$srcdir"/tmp_install$site_packages_path
-  export PATH="$PATH:$srcdir/tmp_install/usr/bin"
-
-  cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial3 --rterrors buildbot
-
-  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-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 561096, buildbot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-02-01 19:09:51 UTC (rev 561097)
@@ -0,0 +1,232 @@
+# 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.6.0
+_bb_contrib_commit=ada3c8f30ca7e1b6bb260e2e5971053fbd254333
+pkgrel=4
+arch=(any)
+url='https://buildbot.net'
+license=(GPL2)
+checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
+              python-moto python-parameterized
+              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-mock python-future
+             python-sphinx-jinja python-sphinxcontrib-blockdiag
+             git yarn)
+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"
+        "https://github.com/yan12125/buildbot/commit/26af545b3f8cbf97f2335e61b08dcf30f447c17b.patch"
+        "pygments-2.5.diff")
+sha256sums=('0ac835b58db309bebcf00fa77687385551833b3dac1c66aa671d271776050c19'
+            'SKIP'
+            'SKIP'
+            '4bf518b614aa208152fb88e39325a8f5b5a681ee91e9033728f2bb20a7704611'
+            '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
+  patch -Np1 -i ../26af545b3f8cbf97f2335e61b08dcf30f447c17b.patch
+
+  # 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-02-01 19:09:30 UTC (rev 561096)
+++ pygments-2.5.diff	2020-02-01 19:09:51 UTC (rev 561097)
@@ -1,39 +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))
-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 -->

Copied: buildbot/repos/community-any/pygments-2.5.diff (from rev 561096, buildbot/trunk/pygments-2.5.diff)
===================================================================
--- pygments-2.5.diff	                        (rev 0)
+++ pygments-2.5.diff	2020-02-01 19:09:51 UTC (rev 561097)
@@ -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 -->



More information about the arch-commits mailing list