Date: Saturday, July 31, 2021 @ 10:29:21 Author: yan12125 Revision: 991075
upgpkg: buildbot 3.3.0-1; this version introduces compatibility with sqlalchemy 1.4 [1], so there is no rebuild for python-sqlalchemy1.3 [1] https://github.com/buildbot/buildbot/pull/6156 Modified: buildbot/trunk/PKGBUILD Deleted: buildbot/trunk/subunit-tests.diff --------------------+ PKGBUILD | 17 +++++------------ subunit-tests.diff | 37 ------------------------------------- 2 files changed, 5 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-31 10:13:30 UTC (rev 991074) +++ PKGBUILD 2021-07-31 10:29:21 UTC (rev 991075) @@ -8,9 +8,9 @@ python-buildbot-www python-buildbot-waterfall-view python-buildbot-console-view python-buildbot-grid-view python-buildbot-wsgi-dashboards python-buildbot-badges) -pkgver=3.2.0 +pkgver=3.3.0 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f -pkgrel=2 +pkgrel=1 arch=(any) url='https://buildbot.net' license=(GPL2) @@ -18,7 +18,7 @@ python-moto python-docker python-parameterized python-mock python-subunit python-graphql-core python-unidiff openssh chromium) -makedepends=(python-twisted python-jinja python-zope-interface python-sqlalchemy1.3 +makedepends=(python-twisted python-jinja python-zope-interface python-sqlalchemy python-sqlalchemy-migrate python-dateutil python-txaio python-autobahn python-pyjwt python-yaml python-setuptools python-future @@ -27,12 +27,10 @@ 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" - "subunit-tests.diff" "buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch") -sha256sums=('b94c62cb92398d1e32d5796f493711ecc568b2430efc856d48912f05ea8afb09' +sha256sums=('2ffa268d7c328545d7e93fce2de1167527a2119c4b4ff0b6faa6ccc257074191' 'SKIP' 'SKIP' - 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55' '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9') validpgpkeys=( '390EB159056ED56F66AB1092AECD456B4D2531FC' # Pierre Tardy <tar...@gmail.com> (@tardyp on GitHub) @@ -57,11 +55,6 @@ sed -i '/buildbot_worker_windows_service/d' worker/setup.py rm -v worker/buildbot_worker/scripts/windows_service.py - # Subunit logs are from testtools. Arch Linux's testtools is patched to use - # traceback instead of traceback2, and causing a difference. See - # https://github.com/testing-cabal/testtools/pull/299 for more defailts. - patch -Np1 -i ../subunit-tests.diff - cd "$srcdir"/buildbot-contrib patch -Np1 -i ../buildbot-contrib-systemd-common.patch } @@ -134,7 +127,7 @@ package_buildbot() { pkgdesc='The Continuous Integration Framework' # include setuptools as plugins are enumerated via pkg_resources - depends=(buildbot-common python-twisted python-jinja python-zope-interface python-sqlalchemy1.3 + depends=(buildbot-common python-twisted python-jinja python-zope-interface python-sqlalchemy python-sqlalchemy-migrate python-dateutil python-txaio python-autobahn python-pyjwt python-yaml python-setuptools) optdepends=( Deleted: subunit-tests.diff =================================================================== --- subunit-tests.diff 2021-07-31 10:13:30 UTC (rev 991074) +++ subunit-tests.diff 2021-07-31 10:29:21 UTC (rev 991075) @@ -1,37 +0,0 @@ -diff --git a/master/buildbot/test/unit/test_steps_subunit.py b/master/buildbot/test/unit/test_steps_subunit.py -index 4e9f326b6..fdac4b17f 100644 ---- a/master/buildbot/test/unit/steps/test_subunit.py -+++ b/master/buildbot/test/unit/steps/test_subunit.py -@@ -120,8 +120,7 @@ class TestSubUnit(steps.BuildStepMixin, TestReactorMixin, unittest.TestCase): - self.expectOutcome(result=FAILURE, state_string="shell Total 1 test(s) 1 error (failure)") - self.expectLogfile('problems', '''\ - test1 --testtools.testresult.real._StringException: Traceback (most recent call last): --ValueError: invalid literal for int() with base 10: '_error1' -+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1' - - ''') - return self.runStep() -@@ -148,12 +147,10 @@ ValueError: invalid literal for int() with base 10: '_error1' - self.expectOutcome(result=FAILURE, state_string="shell Total 2 test(s) 2 errors (failure)") - self.expectLogfile('problems', '''\ - test1 --testtools.testresult.real._StringException: Traceback (most recent call last): --ValueError: invalid literal for int() with base 10: '_error1' -+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error1' - - test2 --testtools.testresult.real._StringException: Traceback (most recent call last): --ValueError: invalid literal for int() with base 10: '_error2' -+testtools.testresult.real._StringException: ValueError: invalid literal for int() with base 10: '_error2' - - ''') - return self.runStep() -@@ -180,7 +177,6 @@ ValueError: invalid literal for int() with base 10: '_error2' - # note that the warnings list is ignored.. - self.expectLogfile('warnings', '''\ - error: test2 [ --Traceback (most recent call last): - ValueError: invalid literal for int() with base 10: '_error2' - ] - ''')