commit fd139b89de20b6d38941f137325e05069995793b Merge: 63d71cc 279874f Author: juga0 juga@riseup.net Date: Tue Mar 16 14:18:41 2021 +0000

Merge branch 'maint-1.1'

.gitlab-ci.yml | 71 +++++++++++++++++++++++++------------- docs/source/torflow_aggr.rst | 25 ++++++++++++++ sbws/config.default.ini | 8 ++--- sbws/core/scanner.py | 8 +++-- sbws/globals.py | 8 +++++ sbws/lib/destination.py | 38 +++++++++++--------- sbws/lib/relaylist.py | 6 +++- sbws/lib/resultdump.py | 9 +++-- sbws/lib/scaling.py | 40 ++++++++++++++++++--- sbws/lib/v3bwfile.py | 31 +++++++++++------ sbws/util/stem.py | 34 ++++++++++++++---- setup.cfg | 3 ++ tests/integration/run.sh | 5 ++- tests/integration/start_chutney.sh | 2 ++ tests/unit/lib/test_resultdump.py | 9 ++--- tests/unit/lib/test_scaling.py | 58 ++++++++++++++++++++++++++++++- tox.ini | 4 +-- 17 files changed, 278 insertions(+), 81 deletions(-)