August 2018 - tor-commits - lists.torproject.org

[sbws/master] Remove support for python 3.4 also in travis
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 10cda4bfdff1b777f5005ce9f5a433290aafa216 Author: juga0 <juga(a)riseup.net> Date: Fri Aug 3 13:16:41 2018 +0000 Remove support for python 3.4 also in travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d328d4..5a551d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: true language: python python: - - "3.4" - "3.5" - "3.6" install: pip install tox-travis

1 0

[sbws/master] Release 0.7.0
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 93adeba76ff29e4d127c1fe54dcf35d3427c6059 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Aug 9 06:43:28 2018 -0400 Release 0.7.0 **Important changes**: - `cleanup/stale_days` is renamed to `cleanup/data_files_compress_after_days` - `cleanup/rotten_days` is renamed to `cleanup/data_files_delete_after_days` - sbws now takes as an argument the path to a config file (which contains `sbws_home`) instead of `sbws_home` (which contains the path to a config file) See the changelog for more information --- CHANGELOG.md | 8 +++++++- sbws/__init__.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b10e4e..e1a6d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.7.0] - 2018-08-09 + **Important changes**: - `cleanup/stale_days` is renamed to `cleanup/data_files_compress_after_days` - `cleanup/rotten_days` is renamed to `cleanup/data_files_delete_after_days` +- sbws now takes as an argument the path to a config file (which contains + `sbws_home`) instead of `sbws_home` (which contains the path to a config +file) ### Added @@ -162,7 +167,8 @@ So fix that. - `earliest_bandwidth` being the newest bw not the oldest (thanks juga0) - `node_id` was missing the character "$" at the beginning -[Unreleased]: https://github.com/pastly/simple-bw-scanner/compare/v0.6.0...master +[Unreleased]: https://github.com/pastly/simple-bw-scanner/compare/v0.7.0...master +[0.7.0]: https://github.com/pastly/simple-bw-scanner/compare/v0.6.0...v0.7.0 [0.6.0]: https://github.com/pastly/simple-bw-scanner/compare/v0.5.0...v0.6.0 [0.5.0]: https://github.com/pastly/simple-bw-scanner/compare/v0.4.1...v0.5.0 [0.4.1]: https://github.com/pastly/simple-bw-scanner/compare/v0.4.0...v0.4.1 diff --git a/sbws/__init__.py b/sbws/__init__.py index 270c7bf..a71c5c7 100644 --- a/sbws/__init__.py +++ b/sbws/__init__.py @@ -1 +1 @@ -__version__ = '0.6.1-dev' +__version__ = '0.7.0'

1 0

[sbws/master] Bump to 0.7.1-dev
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 0ffe0d42fd429042b583ee081fc609dbbb36a714 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Aug 9 06:50:53 2018 -0400 Bump to 0.7.1-dev --- sbws/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/__init__.py b/sbws/__init__.py index a71c5c7..fee9d85 100644 --- a/sbws/__init__.py +++ b/sbws/__init__.py @@ -1 +1 @@ -__version__ = '0.7.0' +__version__ = '0.7.1-dev'

1 0

[sbws/master] Change version variable names
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit b42a77f8b239071986ff0ef94757cdca901328af Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Fri Jul 13 09:43:36 2018 -0400 Change version variable names --- sbws/sbws.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbws/sbws.py b/sbws/sbws.py index c8a6378..a97e428 100644 --- a/sbws/sbws.py +++ b/sbws/sbws.py @@ -7,9 +7,9 @@ from sbws.util.config import get_config from sbws.util.config import validate_config from sbws.util.config import configure_logging from sbws.util.parser import create_parser -from sbws import __version__ as SBWS_VERSION -from stem import __version__ as STEM_VERSION -from requests.__version__ import __version__ as REQ_VERSION +from sbws import __version__ as version +from stem import __version__ as stem_version +from requests.__version__ import __version__ as requests_version import platform import logging @@ -26,7 +26,7 @@ def _get_startup_line(): py_ver = platform.python_version() py_plat = platform.platform() return 'sbws %s with python %s on %s, stem %s, and requests %s' % \ - (SBWS_VERSION, py_ver, py_plat, STEM_VERSION, REQ_VERSION) + (version, py_ver, py_plat, stem_version, requests_version) def main():

1 0

[sbws/master] Log sbws version info line on startup
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit cccfc73fd328a0d9f9e4551bde999bfac11156c5 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jul 11 11:30:48 2018 -0400 Log sbws version info line on startup --- CHANGELOG.md | 5 +++++ sbws/sbws.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c94761d..19b1067 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + +- Log line on start up with sbws version, platform info, and library versions +(trac#26751) + ## [0.6.0] - 2018-07-11 **Important changes**: diff --git a/sbws/sbws.py b/sbws/sbws.py index 5688cea..c8a6378 100644 --- a/sbws/sbws.py +++ b/sbws/sbws.py @@ -7,6 +7,10 @@ from sbws.util.config import get_config from sbws.util.config import validate_config from sbws.util.config import configure_logging from sbws.util.parser import create_parser +from sbws import __version__ as SBWS_VERSION +from stem import __version__ as STEM_VERSION +from requests.__version__ import __version__ as REQ_VERSION +import platform import logging log = logging.getLogger(__name__) @@ -18,6 +22,13 @@ def _adjust_log_level(args, conf): conf['logger_sbws']['level'] = args.log_level +def _get_startup_line(): + py_ver = platform.python_version() + py_plat = platform.platform() + return 'sbws %s with python %s on %s, stem %s, and requests %s' % \ + (SBWS_VERSION, py_ver, py_plat, STEM_VERSION, REQ_VERSION) + + def main(): parser = create_parser() args = parser.parse_args() @@ -47,6 +58,7 @@ def main(): if args.command not in known_commands: parser.print_help() else: + log.info(_get_startup_line()) comm = known_commands[args.command] exit(comm['f'](*comm['a'], **comm['kw'])) except KeyboardInterrupt:

1 0

[sbws/master] Remove tests data v3bw file and refactor test
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 69bb621e082b6d6b1c5e81cea9193648f19f238c Author: juga0 <juga(a)riseup.net> Date: Fri Jul 13 22:26:42 2018 +0000 Remove tests data v3bw file and refactor test reading from the file created in the same test --- tests/unit/lib/data/v3bw/20180425_131057.v3bw | 10 ---------- tests/unit/lib/test_v3bwfile.py | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/tests/unit/lib/data/v3bw/20180425_131057.v3bw b/tests/unit/lib/data/v3bw/20180425_131057.v3bw deleted file mode 100644 index 365be98..0000000 --- a/tests/unit/lib/data/v3bw/20180425_131057.v3bw +++ /dev/null @@ -1,10 +0,0 @@ -1523974147 -version=1.1.0 -earliest_bandwidth=2018-04-16T14:09:07 -file_created=2018-04-25T13:10:57 -generator_started=2018-04-16T14:09:05 -latest_bandwidth=2018-04-17T14:09:07 -software=sbws -software_version=0.6.1-dev -==== -bw=54 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s nick=A node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07 diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 9a9a0a5..0af1834 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -112,20 +112,6 @@ def test_v3bwline_from_results_file(datadir): assert bwl_str == str(bwl) -def test_v3bwfile(datadir, tmpdir): - """Test generate v3bw file (including relay_lines).""" - # at some point this should be obtained from conftest - v3bw = datadir.read('v3bw/20180425_131057.v3bw') - results = load_result_file(str(datadir.join("results.txt"))) - header = V3BWHeader(timestamp_l, - file_created=file_created, - generator_started=generator_started, - earliest_bandwidth=earliest_bandwidth) - bwls = [V3BWLine.from_results(results[fp]) for fp in results] - f = V3BWFile(header, bwls) - assert v3bw == str(f) - - def test_from_arg_results(datadir, tmpdir, conf, args): results = load_result_file(str(datadir.join("results.txt"))) expected_header = V3BWHeader(timestamp_l, @@ -136,7 +122,6 @@ def test_from_arg_results(datadir, tmpdir, conf, args): v3bwfile = V3BWFile.from_arg_results(args, conf, results) assert str(expected_f)[1:] == str(v3bwfile)[1:] output = os.path.join(args.output, now_fname()) - print(output) v3bwfile.write(output) @@ -146,3 +131,13 @@ def test_from_arg_results_write(datadir, tmpdir, conf, args): output = os.path.join(args.output, now_fname()) v3bwfile.write(output) assert os.path.isfile(output) + + +def test_from_arg_results_write_read(datadir, tmpdir, conf, args): + results = load_result_file(str(datadir.join("results.txt"))) + v3bwfile = V3BWFile.from_arg_results(args, conf, results) + output = os.path.join(args.output, now_fname()) + v3bwfile.write(output) + with open(output) as fd: + v3bw = fd.read() + assert v3bw == str(v3bwfile)

1 0

[sbws/master] Add changelog entry about generate times
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit b4bfea6e16a05608a077de6067c058c732800936 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 16 02:33:10 2018 +0000 Add changelog entry about generate times --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19b1067..b3e911c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Log line on start up with sbws version, platform info, and library versions (trac#26751) +### Changed + +- Document at which times should v3bw files be generated (#26740) + ## [0.6.0] - 2018-07-11 **Important changes**:

1 0

[sbws/master] Add at which times should v3bw files be generated
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit 92135a7404b71a7fa07bf7f7ecbf3c0a85ce9f85 Author: juga0 <juga(a)riseup.net> Date: Mon Jul 16 02:31:04 2018 +0000 Add at which times should v3bw files be generated --- sbws/core/generate.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index c0e7c8b..f952fbc 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -12,7 +12,12 @@ log = logging.getLogger(__name__) def gen_parser(sub): d = 'Generate a v3bw file based on recent results. A v3bw file is the '\ 'file Tor directory authorities want to read and base their '\ - 'bandwidth votes on.' + 'bandwidth votes on.' \ + 'This file should be generated every hour at any minute, except ' \ + 'between 45 and 55 minutes past the hour because Tor read this file '\ + ' at minute 50 and except ' \ + 'between 15 and 25 minutes past the hour because Tor read this file '\ + ' at minute 20 during a consensus failure.' p = sub.add_parser('generate', description=d, formatter_class=ArgumentDefaultsHelpFormatter) p.add_argument('--output', default=None, type=str,

1 0

[sbws/master] Add changelog entry about test data file removed
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit aa3ebcb2fdef32012a781dfe8e1faae03c980f1b Author: juga0 <juga(a)riseup.net> Date: Fri Jul 13 22:42:17 2018 +0000 Add changelog entry about test data file removed --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3e911c..cfac048 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + +- Remove test data v3bw file and generate it from the same test. (#26736) + ### Added - Log line on start up with sbws version, platform info, and library versions

1 0

[sbws/master] Add indent to state file to make it more human readable
by pastly＠torproject.org 09 Aug '18

09 Aug '18

commit b30288e0e5427f3568af332f87d95dbdeb00e3eb Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jul 16 14:48:22 2018 -0400 Add indent to state file to make it more human readable --- sbws/util/state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/state.py b/sbws/util/state.py index 58aef38..85e223c 100644 --- a/sbws/util/state.py +++ b/sbws/util/state.py @@ -20,7 +20,7 @@ class State: def _write(self): with FileLock(self._fname): with open(self._fname, 'wt') as fd: - return json.dump(self._state, fd) + return json.dump(self._state, fd, indent=4) def __len__(self): self._state = self._read()

1 0