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

[sbws/master] Use recent_results, since min_num_success_results
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 9b24a0b13c8d5203808f850c28aa6e7a04d70bcd Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 10:19:31 2018 +0000 Use recent_results, since min_num_success_results has been removed. Also add logging --- sbws/lib/v3bwfile.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index e9cacb0..f0cd64a 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -280,7 +280,11 @@ class V3BWLine(object): '{} results.'.format(min_num)) return None results_away = \ - cls.results_away_each_other(min_num_success_results, secs_away) + cls.results_away_each_other(success_results, secs_away) + if not results_away: + log.debug("There are no results with relays' results away from" + " each other {}".format(secs_away)) + return None results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: return None

1 0

[sbws/master] Stop returning 1 result as seconds away from other
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 5500ddf569a5adf5168e7703b64c1283041f4bce Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:04:54 2018 +0000 Stop returning 1 result as seconds away from other --- sbws/lib/v3bwfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 6fe5a20..6e06c6b 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -339,6 +339,10 @@ class V3BWLine(object): for r in reversed(results[:-1]): if abs(results_away[0].time - r.time) > secs_away: results_away.insert(0, r) + # if there is only 1 result, is the one inserted at the beginning, + # so there are no results away from each other + if len(results_away) < 2: + return None return results_away @staticmethod

1 0

[sbws/master] Merge branch 'ticket28041_fix_num_results'
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 8f4c5b8a8e775165810b188663e489e8ac91d050 Merge: 7485697 a9deba5 Author: juga0 <juga(a)riseup.net> Date: Tue Oct 16 13:04:04 2018 +0000 Merge branch 'ticket28041_fix_num_results' CHANGELOG.md | 2 ++ sbws/lib/v3bwfile.py | 25 +++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --cc CHANGELOG.md index bf1bfd0,3229af7..f58bfe3 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -9,11 -9,8 +9,13 @@@ and this project adheres to [Semantic V ### Fixed +- Update python minimal version in setup (#28043) + +### Changed + +- Move ``examples/`` to ``docs/`` (#28040) + - Number of results comparison and number of results away from each other are + incorrect (#28041) ## [0.8.0] - 2018-10-08

1 0

[sbws/master] Add changelog entry about number of min results
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 5090c38fe52359b0244ff48e3c495394cb5ecec8 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:28:52 2018 +0000 Add changelog entry about number of min results and results away --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 464f7ee..3229af7 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] +### Fixed + +- Number of results comparison and number of results away from each other are + incorrect (#28041) + ## [0.8.0] - 2018-10-08 **Important changes**:

1 0

[sbws/master] Ops, line commented too long, repphrase
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit a9deba5b6bc5d402fce412ca73cee93113316f1c Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:44:20 2018 +0000 Ops, line commented too long, repphrase --- sbws/lib/v3bwfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 6e06c6b..4eecda6 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -276,8 +276,7 @@ class V3BWLine(object): # useful args for scaling if success_results: if not len(success_results) >= min_num: - # log.debug('There are no results with relays that have at least' - # '{} results.'.format(min_num)) + # log.debug('The number of results is les than %s', min_num) return None results_away = \ cls.results_away_each_other(success_results, secs_away)

1 0

[sbws/master] Move examples to docs/
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 3a766569f8edacacf59a16de08d0337806b03a19 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:11:01 2018 +0000 Move examples to docs/ and do not include them as data files in python packages, since system packages will then include them in /usr --- {examples => docs/examples}/config.example.ini | 0 docs/source/config.rst | 2 +- setup.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/config.example.ini b/docs/examples/config.example.ini similarity index 100% rename from examples/config.example.ini rename to docs/examples/config.example.ini diff --git a/docs/source/config.rst b/docs/source/config.rst index cafe5fe..84c850f 100644 --- a/docs/source/config.rst +++ b/docs/source/config.rst @@ -27,7 +27,7 @@ The user example config file provided by ``sbws`` might look like this. .. _init-config: -.. literalinclude:: config.example.ini +.. literalinclude:: examples/config.example.ini :caption: Example config.example.ini **No other configuration files are read.** diff --git a/setup.py b/setup.py index 8e93e7b..31a5eb4 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def get_package_data(): def get_data_files(): - return [('examples', [os.path.join('examples', 'config.example.ini')])] + pass def find_version():

1 0

[sbws/master] Add changelog entry about moving examples to docs
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 4c183249cebec97eeaff821e8b2b0fbc818c425c Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:20:49 2018 +0000 Add changelog entry about moving examples to docs --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 464f7ee..c7d26d7 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 + +- Move ``examples/`` to ``docs/`` (#28040) + ## [0.8.0] - 2018-10-08 **Important changes**:

1 0

[sbws/master] Merge branch 'ticket28040_mv_examples_docs'
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 74856970c6ccca1324d63f75654c7796a2deadc4 Merge: 6c737a1 4c18324 Author: juga0 <juga(a)riseup.net> Date: Tue Oct 16 13:02:07 2018 +0000 Merge branch 'ticket28040_mv_examples_docs' CHANGELOG.md | 4 ++++ {examples => docs/examples}/config.example.ini | 0 docs/source/config.rst | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --cc CHANGELOG.md index 9bc7631,c7d26d7..bf1bfd0 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -7,10 -7,10 +7,14 @@@ and this project adheres to [Semantic V ## [Unreleased] +### Fixed + +- Update python minimal version in setup (#28043) + + ### Changed + + - Move ``examples/`` to ``docs/`` (#28040) + ## [0.8.0] - 2018-10-08 **Important changes**:

1 0

[sbws/master] Update python minimal version
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 9ac1c748d3ed92bd07164c93a77a013fb965507e Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:55:16 2018 +0000 Update python minimal version to 3.5, we stop supporting 3.4 --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8e93e7b..7c575a4 100755 --- a/setup.py +++ b/setup.py @@ -55,7 +55,6 @@ setup( 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Topic :: System :: Networking', @@ -67,7 +66,7 @@ setup( }, data_files=get_data_files(), keywords='tor onion bandwidth measurements scanner relay circuit', - python_requires='>=3.4.5', + python_requires='>=3.5', entry_points={ 'console_scripts': [ 'sbws = sbws.sbws:main',

1 0

[sbws/master] Add changelog entry about python minimum version
by juga＠torproject.org 16 Oct '18

16 Oct '18

commit 6c737a12fcee84a986075f1c3151d0a93d547fd0 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 15 11:57:57 2018 +0000 Add changelog entry about python minimum version --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 464f7ee..9bc7631 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] +### Fixed + +- Update python minimal version in setup (#28043) + ## [0.8.0] - 2018-10-08 **Important changes**:

1 0