commit a016ab4fb9d677999d2a376dcfb998b942a1acc3 Merge: fd139b8 888fb6e Author: juga0 juga@riseup.net Date: Thu Mar 18 08:11:25 2021 +0000
Merge branch 'maint-1.1'
.coveragerc | 1 + .editorconfig | 10 +- .gitattributes | 1 + .gitlab-ci.yml | 7 +- MANIFEST.in | 8 +- docs/source/contributing.rst | 10 +- docs/source/examples/sbws.example.ini | 2 +- docs/source/generator.rst | 6 +- docs/source/glossary.rst | 4 +- docs/source/how_works.rst | 2 +- docs/source/implementation.rst | 10 +- docs/source/man_sbws.rst | 2 +- docs/source/roadmap.rst | 2 +- docs/source/testing.rst | 2 +- pyproject.toml | 24 + sbws/__init__.py | 10 +- sbws/_version.py | 189 +++-- sbws/core/cleanup.py | 121 +-- sbws/core/generate.py | 234 +++--- sbws/core/scanner.py | 544 +++++++++----- sbws/core/stats.py | 154 ++-- sbws/globals.py | 90 +-- sbws/lib/bwfile_health.py | 17 +- sbws/lib/circuitbuilder.py | 53 +- sbws/lib/destination.py | 265 ++++--- sbws/lib/heartbeat.py | 18 +- sbws/lib/relaylist.py | 172 +++-- sbws/lib/relayprioritizer.py | 64 +- sbws/lib/resultdump.py | 586 +++++++++------ sbws/lib/scaling.py | 3 +- sbws/lib/v3bwfile.py | 816 ++++++++++++--------- sbws/sbws.py | 65 +- sbws/util/config.py | 551 ++++++++------ sbws/util/filelock.py | 30 +- sbws/util/fs.py | 86 ++- sbws/util/iso3166.py | 273 ++++++- sbws/util/json.py | 2 +- sbws/util/parser.py | 32 +- sbws/util/requests.py | 17 +- sbws/util/state.py | 9 +- sbws/util/stem.py | 171 +++-- sbws/util/timestamps.py | 2 +- sbws/util/userquery.py | 25 +- setup.cfg | 97 ++- setup.py | 86 +-- tests/conftest.py | 19 +- .../integration/chutney_data/client_bwscanner.tmpl | 2 +- tests/integration/conftest.py | 52 +- tests/integration/core/test_scanner.py | 46 +- tests/integration/lib/test_destination.py | 72 +- tests/integration/lib/test_relaylist.py | 13 +- tests/integration/lib/test_relayprioritizer.py | 57 +- tests/integration/run.sh | 5 +- tests/integration/util/test_requests.py | 15 +- tests/integration/util/test_stem.py | 8 +- tests/unit/conftest.py | 208 +++--- tests/unit/core/test_generate.py | 22 +- tests/unit/core/test_stats.py | 55 +- tests/unit/lib/test_destination.py | 4 +- tests/unit/lib/test_heartbeat.py | 9 +- tests/unit/lib/test_relaylist.py | 6 +- tests/unit/lib/test_resultdump.py | 47 +- tests/unit/lib/test_results.py | 235 +++--- tests/unit/lib/test_scaling.py | 25 +- tests/unit/lib/test_v3bwfile.py | 506 +++++++------ tests/unit/test_bwfile_health.py | 12 +- tests/unit/util/test_config.py | 325 ++++---- tests/unit/util/test_state.py | 69 +- tests/unit/util/test_stem.py | 15 +- tests/unit/util/test_timestamp.py | 24 +- tests/unit/util/test_timestamps.py | 5 +- tests/unit/util/test_userquery.py | 83 ++- tox.ini | 106 ++- versioneer.py | 169 +++-- 74 files changed, 4299 insertions(+), 2788 deletions(-)