buildbot: fix compatibility with SQLAlchemy 1.4
This commit is contained in:
parent
906997c95b
commit
b4ce66c0bb
1 changed files with 14 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k
|
||||
, python, twisted, jinja2, zope_interface, sqlalchemy
|
||||
, sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
|
||||
, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
|
||||
|
@ -78,6 +78,19 @@ let
|
|||
# This patch disables the test that tries to read /etc/os-release which
|
||||
# is not accessible in sandboxed builds.
|
||||
./skip_test_linux_distro.patch
|
||||
# Fix compatibility with SQLAlchemy 1.4
|
||||
(fetchpatch {
|
||||
url = "https://github.com/buildbot/buildbot/pull/6156.patch";
|
||||
sha256 = "10pg3wcdy85vymn6hprm7rh68zkz818m2vy6v4s2hi2l189wh5my";
|
||||
stripLen = 1;
|
||||
excludes = [
|
||||
".bbtravis.yml"
|
||||
"buildbot/test/unit/db/test_enginestrategy.py"
|
||||
"buildbot/test/unit/db_migrate/test_versions_045_worker_transition.py"
|
||||
"requirements-ci.txt"
|
||||
"requirements-cidb.txt"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in a new issue