Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
db355fbc
by Ansgar at 2020-12-05T13:23:48+01:00
-
0d3a5e7f
by Ansgar at 2020-12-05T13:35:32+01:00
-
cd737a11
by Ansgar at 2020-12-05T13:42:17+01:00
3 changed files:
Changes:
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 |
test buster:
|
7 | 7 |
<<: *template
|
8 | 8 |
image: debian:buster
|
9 |
- parallel: 2
|
|
9 |
+ parallel: 3
|
|
10 | 10 |
script: debian/run-ci --with-coverage
|
11 | 11 |
artifacts:
|
12 | 12 |
paths:
|
... | ... | @@ -15,7 +15,7 @@ test buster: |
15 | 15 |
test bullseye:
|
16 | 16 |
<<: *template
|
17 | 17 |
image: debian:bullseye
|
18 |
- parallel: 2
|
|
18 |
+ parallel: 3
|
|
19 | 19 |
script: debian/run-ci --with-coverage
|
20 | 20 |
artifacts:
|
21 | 21 |
paths:
|
... | ... | @@ -35,6 +35,7 @@ import apt_pkg |
35 | 35 |
import daklib.daksubprocess
|
36 | 36 |
from daklib.gpg import GpgException
|
37 | 37 |
import functools
|
38 |
+import inspect
|
|
38 | 39 |
import os
|
39 | 40 |
from os.path import normpath
|
40 | 41 |
import re
|
... | ... | @@ -45,8 +46,6 @@ import warnings |
45 | 46 |
from debian.debfile import Deb822
|
46 | 47 |
from tarfile import TarFile
|
47 | 48 |
|
48 |
-from inspect import getargspec
|
|
49 |
- |
|
50 | 49 |
import sqlalchemy
|
51 | 50 |
from sqlalchemy import create_engine, Table, desc
|
52 | 51 |
from sqlalchemy.orm import sessionmaker, mapper, relation, object_session, \
|
... | ... | @@ -117,7 +116,7 @@ def session_wrapper(fn): |
117 | 116 |
session = kwargs.get('session')
|
118 | 117 |
|
119 | 118 |
if session is None:
|
120 |
- if len(args) <= len(getargspec(fn)[0]) - 1:
|
|
119 |
+ if len(args) < len(inspect.getfullargspec(fn).args):
|
|
121 | 120 |
# No session specified as last argument or in kwargs
|
122 | 121 |
private_transaction = True
|
123 | 122 |
session = kwargs['session'] = DBConn().session()
|
... | ... | @@ -57,7 +57,7 @@ class ParseDscTestCase(ParseChangesTestCase): |
57 | 57 |
|
58 | 58 |
def test_8(self):
|
59 | 59 |
# No armored contents
|
60 |
- with self.assertRaisesRegexp(ParseChangesError, "Empty changes"):
|
|
60 |
+ with self.assertRaisesRegex(ParseChangesError, "Empty changes"):
|
|
61 | 61 |
self.assertParse('dsc/8.dsc', -1, 1)
|
62 | 62 |
|
63 | 63 |
def test_9(self):
|