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

[sbws/master] Merge branch 'maint-1.1' into master
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit e6f5f98b5e322b4ac62f178423a839648ac1d38b Merge: a37f39a 4106ade Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:07:17 2020 +0000 Merge branch 'maint-1.1' into master docs/source/contributing.rst | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)

1 0

[sbws/master] Merge branch 'maint-1.1' into master
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 2e38dcb3ffaca6270393c37ce4e33d585e62d5e1 Merge: 8b6b363 4b29a49 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 23 19:15:34 2020 +0000 Merge branch 'maint-1.1' into master sbws/config.default.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/26' into maint-1.1
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 685c9e7325794b8481edb5d3a3529bbf7e4d1085 Merge: 4106ade 2924e44 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:11:46 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/26' into maint-1.1 sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-)

1 0

[sbws/master] Merge branch 'maint-1.1' into master
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 8b6b36312067703df48047ba8f148b4ef664e07b Merge: e6f5f98 685c9e7 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:12:17 2020 +0000 Merge branch 'maint-1.1' into master sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-)

1 0

[sbws/maint-1.1] fix: v3bwfile: Avoid statistics without data
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 2924e440373341abfb1548c61db3608fb7eebfad Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 16:02:01 2020 +0000 fix: v3bwfile: Avoid statistics without data If mean or median argument is empty, they throw an exception. This can happen when the scanner has stopped and the result is stored as successful without any downloads. Closes: #40012 --- sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 0fc3f84..079f36b 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -14,6 +14,10 @@ def bw_filt(bw_measurements): It is the equivalent to Torflow's ``filt_sbw``. ``mu`` in this function is the equivalent to Torflow's ``sbw``. """ - mu = mean(bw_measurements) - bws_gte_mean = filter(lambda bw: bw >= mu, bw_measurements) - return mean(bws_gte_mean) + mu = 1 + if bw_measurements: + mu = mean(bw_measurements) + bws_gte_mean = list(filter(lambda bw: bw >= mu, bw_measurements)) + if bws_gte_mean: + return mean(bws_gte_mean) + return 1 diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 13b202c..45563b6 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -869,13 +869,19 @@ class V3BWLine(object): @staticmethod def bw_median_from_results(results): - return max(round(median([dl['amount'] / dl['duration'] - for r in results for dl in r.downloads])), 1) + bws = [dl['amount'] / dl['duration'] + for r in results for dl in r.downloads] + if bws: + return max(round(median(bws)), 1) + return 1 @staticmethod def bw_mean_from_results(results): - return max(round(mean([dl['amount'] / dl['duration'] - for r in results for dl in r.downloads])), 1) + bws = [dl['amount'] / dl['duration'] + for r in results for dl in r.downloads] + if bws: + return max(round(mean(bws)), 1) + return 1 @staticmethod def last_time_from_results(results):

1 0

[sbws/maint-1.1] fix: doc: No need to use Travis anymore
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit bb2a3c6119569d76237a0074c70514ad599dd82b Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 15:47:05 2020 +0000 fix: doc: No need to use Travis anymore --- docs/source/contributing.rst | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 60602ad..c17aa4a 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -63,19 +63,12 @@ Steps to create a MR extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc. 8. Ensure tests pass (./TESTING.rst). 9. Push your branch to your Gitlab repository. - -We are temporally using Github Travis to ensure tests pass. For this: - -10. Clone ``sbws`` via the Github web interface: - https://github.com/torproject/sbws -11. Push your branch to your Github repository. - -12. If you have an account in Travis, you can see whether it pass the tests in - Github and at https://travis-ci.org/youruser/sbws/ +10. Ensure the CI tests are passing + (https://gitlab.torproject.org/tpo/network-health/sbws/-/pipelines) Finally: -13. Create a MR from your branch at +11. Create a MR from your branch at https://gitlab.torproject.org/tpo/network-health/sbws

1 0

[sbws/maint-1.1] fix: v3bwfile: Take all measurements when IP changes
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit f82ea6a6ac95d2eb61211b4ca7af84a52ce55e13 Author: juga0 <juga(a)riseup.net> Date: Tue Jun 23 17:35:39 2020 +0000 fix: v3bwfile: Take all measurements when IP changes Previously, when a relay changes IP, only the measurements with the last IP were considered. Relays with dynamic IP could get unmeasured that way. Now, all the measurements are considered. Closes: #33832. Bugfix 0.5.0. --- sbws/config.default.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 81b4b07..f159b68 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -30,7 +30,7 @@ circuit_timeout = 10 # address changes. If it changes, we only consider results for the relay that # we obtained while the relay was located at its most recent IP address. # This is NOT implemented for IPv6. -reset_bw_ipv4_changes = on +reset_bw_ipv4_changes = off reset_bw_ipv6_changes = off [scanner] @@ -123,4 +123,3 @@ to_stdout_format = ${format} to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s # verbose formatter useful for debugging to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s -

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/28' into maint-1.1
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 4106adefb1ac52ddb4b88dc381122224500961b1 Merge: 4bed2ce bb2a3c6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:06:46 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/28' into maint-1.1 docs/source/contributing.rst | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)

1 0

[sbws/maint-1.1] fix: doc: Clarify branch to use when contributing
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit ed835c416a2c75c055914e88c2daa7654b7df934 Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 15:45:03 2020 +0000 fix: doc: Clarify branch to use when contributing Closes: #33473 --- docs/source/contributing.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 0d41689..60602ad 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -51,9 +51,14 @@ Steps to create a MR Use ``pip install -e <>`` 5. If needed install the documentation and build it as explained in ./DOCUMENTATION.rst -6. Create a new branch, named ``ticketXXX``. - Optionally, name it with a string explaining what it does, - ie ``ticketXXX_contributing`` +6. Create a new feature branch. + If the issue solves a bug, base the branch on the latest maintained version, + eg. ``maint-1.1`` and name it with the name of the base branch plus + ``_bugXXX``, where `XXX` is the number of the issue. + If the issue is a new feature, base the branch on the `master` branch and + name it ``ticketXXX``. + Optionally, the last part of the branch name can be any string, eg. + ``maint-1.1_bugXXX_contributing``. 7. Write code (:ref:`codestyle-ref`), tests, documentation, extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc. 8. Ensure tests pass (./TESTING.rst).

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/26' into maint-1.1
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 685c9e7325794b8481edb5d3a3529bbf7e4d1085 Merge: 4106ade 2924e44 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:11:46 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/26' into maint-1.1 sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-)

1 0