April 2021 - tor-commits - lists.torproject.org

[sbws/master] Merge branch 'bug_40082' into 'maint-1.1'
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 36d96da7c36b6c02751eb7697b17d78cdea8f2e6 Merge: 37d5c0a 664742c Author: juga <juga(a)riseup.net> Date: Mon Mar 22 16:30:43 2021 +0000 Merge branch 'bug_40082' into 'maint-1.1' fix: doc: Clarify Torflow aggregation Closes #40082 See merge request tpo/network-health/sbws!80 docs/source/torflow_aggr.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[sbws/master] Prepare release version 1.2.0.
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 9e165ce63acf8edc805736dad963528c24033ef7 Author: juga0 <juga(a)riseup.net> Date: Wed Apr 14 08:35:17 2021 +0000 Prepare release version 1.2.0. Update changelog, updated automatically, manually fixed typos and and new lines. Closes #40004. --- CHANGELOG.rst | 607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 607 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bc55b15..7969a47 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,613 @@ The format is based on `Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`__ and this project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__. +1.2.0 +----- + +New +~~~ +- Docs: Include script on how to release. +- Scripts: Add script to help new releases. +- Add gitchangelog template. +- Add gitchangelog configuration file. +- Docs: Add bwauths list image. +- Relaylist: Keep relays not in last consensus. + Keep the relays that are not in the the last consensus, but are not + "old" yet. +- Util: Add function to know if timestamp is old. + Part of #30727. + +Changes +~~~~~~~ +- Stem: Set default torrc options. + when connecting to an external tor and they are not already set. +- Generate, cleanup: Use 28 days of measurements. + When generating the Bandwidth File as Torflow, use 28 days of past raw + measurements instead of 5, by default. + Also keep the raw measurements for that long before compressing or + deleting them. + And stop checking whether the compression and delete + periods are valid, without checking defaults first and based on + arbitrary values. +- Stem: Add function to connect or start tor. + Move initialization via existing socket to this new function and start + tor only when it fails. +- Stem, scanner: Change args initializing controller. + to check whether the external control port configuration is set. + There is no need to assert all argument options nor to return the error. +- Config: Add option to connect to external tor. + via control port. +- Circuitbuilder: Remove not used attributes. + and make argument optional. +- Circuitbuilder: Simplify building circuit. + Since sbws is only building 2 hop paths, there is no need to add random + relays to the path, or convert back and forth between fingerprint and + ``Relay`` objects. + This will eliminate the circuit errors: + - Tor seems to no longer think XXX is a relay + - Can not build a circuit, no path. + - Can not build a circuit with the current relays. + If a relay is not longer running when attempting to build the circuit, + it will probably fail with one of the other circuit errors: TIMEOUT, + DESTROYED or CHANNEL_CLOSED. +- Scanner: Stop storing recent_measurement_attempt. + because it stores a timestamp for each attempt, which makes state.dat + grow thousand of lines (json). + Closes #40023, #40020 +- V3bwfile: Exclude relays without observed bw. + and without consensus bw from scaling. + Part of #33871, closes #33831. +- V3bwfile: Percentage difference with consensus. +- V3bwfile: Calculate hlimit from scaled sum bw. + instead of bw before scaling. + Tests have finally correct value. + For 1 result, only when the cap is 1, the value will be equal to the + rounded bw because the cap does not limit it. +- V3bwfile: Obtain consensus values from last consensus. +- V3bwfile: Round scaled bandwidth after capping. + Make tests pass because the high limit change the expected values, + but the final value still needs to be fixed. +- V3bwfile: Change logic obtaining min bandwidth. + Take either the consenus bandwidth or the descriptor bandwidth if + one of them is missing, do not scale when both are missing and + ignore descriptor average and burst when they are missing. +- V3bwfile: Scale relays missing descriptor bws. + Scale relays without average or observed bandwidth. + Later it will be check what to do if their values are None or 0 +- V3bwfile: Stop making mean minimum 1. +- V3bwfile: Calculate filtered bandwidth. + for each relay, calculate the filtered mean for all relays and + calculate the filtered ratio for each relay. +- Scaling: Add filtered bandwidth function. + to calculate the filtered bandwidth for each relay. +- Bwfile: Test KeyValues in a bandwidth file. + Added: + - library to check whether the KeyValues make sense + - test an example bandwidth file + - a command to check an arbitrary bandwidth file + Finally, doing something with all these KeyValues! + (Quarantine day 7th) +- V3bwfile: Count recent relay's monitoring numbers. + using timestamps class. + Also add one more result to the tests data and change the + test accordingly. +- Tests: Remove `_count` from attr. +- Resultdump: Add missing attrs to errors. +- Resultdump: Remove `_count` from attributes. + Tests wont' pass with this commit, they'll be fixed in the next commits +- Relayprioritizer: Count priorities with timestamps. + in RelayPrioritizer: + + - Rename recent_priority_list_count to recent_priority_list when + there is no counting + - Rename recent_priority_relay_count to recent_priority_relay + when there is no counting + - Use the timestamps class to manage/count priority lists/relays +- Relaylist: Count measurements with timestamps. + in RelayList: + + - Rename recent_measurement_attempt_count to recent_measurement_attempt when + there is no counting + - Use the timestamps class to manage/count measurement attempts +- Relaylist, v3bwfile: Count consensus with timestamps. + in RelayList: + + - Rename consensus_timestamps to recent_consensus + - Rename recent_consensus_count to recent_consensus when there is + no counting + - Use the timestamps class to manage/count consensuses + - Remove method not needed anymore +- V3bwfile: Convert datetime to str. +- Resultdump: Use custom json encoder/decoder. +- State: Encode/decode datetimes. +- Json: Create custom JSON encoder/decoder. + to be able to serialize/deserialize datetime in the state file. +- Timestamps: Add module to manage datetime sequences. +- State: Add method to count list values. + +Fix +~~~ +- Clarify release script dependencies. +- Use rst changelog template. + and put in the same entry commit subject and body removing new lines. +- Correct network stream and filtered bw. + because Torflow is not using them by relay type. +- V3bwfile: network means without relay type. + This reverts commit fc3d3b992ada601a6255f8a6889179abd4b7e55e and partially + reverts a82c26184097bea3ca405ae19773de7c4354a541. + It was a mistake to think torflow was using the means by relay type, + it actually sets the same networks means for all relay types. + Closes #40080. +- Semi-automatic correction of typos. + Closes #33599. +- Tests: Add codespell configuration. +- Tests: Additional security tests. +- CI: Use all tox environments for python 3.8. +- 2nd round of automatic format. + black insists to keep one long line and flake complain, therefore make + flake to ignore it. +- Flake8 errors. +- Reorder imports with isort. +- Reformat all with black. +- Move to declarative setup.cfg. + Also: + - Update versioneer + - And include other source distribution files in MANIFEST.in + - Add project URLs + - Add formatter and linter dependencies and configurations. + - tox: Remove travis, fix python environments + - tox: Remove extra coverage options and add them in .coveragerc. +- Indent by default to 2 except python files. + also uncomment final newline. Can be commented again in case it fails +- V3bwfile: network means by relay type. + Calculate network stream and filtered bandwidth averages per relay + type, to obtain bandwidth weights the same way as Torflow. + Closes #40059. +- Scaling: Return mean if no bw >= mean. +- Scaling: Stop returning 1 as the means minima. + since they are used as the numerator when calculating the ratio and the + rounding already returns a minimum of 1. +- Scaling: Return if there are no measurements. + it should not be the case because the measurements come from + successful results, but otherwise it'd throw an exception. +- Tests: Add bw filtered from results. +- Scaling: round bandwidth filtered. + because Torflow does it. +- Scanner: Return from measure if no helper. + After refactoring in #40041, it was forgotten to return the error in + the case a helper was not found, what can happen in test networks. + Closes #40065. +- Tests: debug log for tests by default. + and fix test that didn't consider that there might be other logs from + other threads. + Closes #33797. +- Scanner: Log times kept. + not only the times that are not kept. + Closes #40060 +- CI: Temporal workaround for #40072. +- Relalist: Use the consensus timestamp. + to the relay consensus timestamps list, so that it can be + tested it was in a concrete consensus. +- CI: Exit from integration script. + when any of the commands fail. +- CI: Update Python versions. + Closes #40055. +- CI: Update tor versions. +- System physical requirements. + After fixing #40017, the datadir files are compressed after 29 days and + deleted after 57. However the total used disk space is less than 3G, + leaving 3G as precaution. + Closes #40044. +- Scanner: Return from measure if no helper. + After refactoring in #40041, it was forgotten to return the error in + the case a helper was not found, what can happen in test networks. + Closes #40065. +- Update differences Torflow/sbws. + Closes #40056 +- Reorganize Torflow aggregation. + - reorganize sections + - add diagrams and links + - add pseudocode + - remove math + - correct statements + So that it's more accurate and easier to understand. +- Docs: Rename section, add diagrams. +- Separate Torflow/sbws differences. + into a new file. +- Add target to call plantuml. + and generate .svg from .puml files. + Do not add to the html target since the generated svg images are + not deterministic and will change every time `plantuml` is call. +- Separate how scanner and generator work. + in different files and link to each other. +- Add missing new lines. +- CI: Make wget quiet. + to avoid many lines of non useful text the CI. +- Scanner: Rm condition assigning helper. +- Scanner: Move as_entry/as_exit into one function. + since they're similar code +- Scanner: remove relay to measure as helper. +- Scanner: log exit policy when stream fails. +- Relaylist: Remove duplicated can exit methods. + After refactoring and making clear when we were using exit(s) that can + exit to all public IPs (and a port) or only some, refactor them + removing the duplicated code and adding the `strict` argument. +- Add relay measure activity diagram. +- Scanner: extract method on circuit error. + At some point all possible errors should be exceptions. +- Scanner: extract method for not helper case. +- Scanner: extract method to create paths. + because `measure_relay` method is too long, confusing and we have had + several bugs in this part of the code. +- Relaylist: Add methods to obtain exits that. + can exit to some IPs. + To use them in the cases it will be more convenient. +- Relaylist: rename exits_not_bad_allowing_port. + see previous commit +- Relaylist: rename is_exit_not_bad_allowing_port. + see previous commit +- Relaylist: rename can_exit_to_port. + to can_exit_to_port_all_ips, because it's using `strict`, which means + that it allows to exit to all IPs. + It seems more convenient to try first with exits that allow to + exit to some IPs and only try a second time if that fails, because + there are more. +- Resultdump: Check that the error has a circuit. + Because if the error is not a circuit error, it does not have that + attribute. +- Tests: Run integration tests with chutney. + and adapt the tests to pass. + \o/ +- Add chutney configuration. + and scripts to run the integration tests with chutney. + It does not replace yet the way integration tests are run. +- Stem: Move torrc option that does not depend on config. + It seems we forgot this option when refactoring in #28738. +- Stem: Remove torrc option that is the default. + to avoid conflict when comparing the options that should be set and the + ones are set, since the SocksPort will be differently in chutney. +- Resultdump: Log if relay was measured as exit. + or entry. + Closes #40048 +- Relaylist: Stop measuring relays not in the consenus. + as this might cause many circuit errors. + They're already added to the generator. + Also adapt the number in test_init_relays. +- Sphinx warnings when creating documentation. + This should give us at least a clean html, text, and man build + experience. + Closes #40036. +- Add forgotten image from consensus health. + It was referenced by 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d. Since that + image was wrong, created a new screenshot from the current "past 90 + days" at consensus-health.tpo. +- Stem: Add possible exception cause. +- Stem: Remove unused code. +- Stem: Exit on failure connecting to control port. + because when trying to connect to an external tor (chutney), it does + not make sense to start own tor. + Also log how the connection has been made. +- Update values in config_tor.rst + clean-up. + Closes #40035. +- Update default values in man_sbws.ini.rst. + Closes #40034. +- Clean up config.rst. + Closes #40033. +- Scanner: Retry to measure exit as exit. + if it fails to be measured as entry. + Mayb closes: #40029. +- Relaylist: Comment on IPv6 exit policy. + that could be also checked, increasing the chances that the exit can + exit to our Web servers. + But if it could not, then we need to retry to measure it as 1st hop. +- Config: Increment circuit build timeout. + setting it to the default, 60secs. + Since many relays fail to be measured cause of circuit timeout. + Maybe closes #40029. +- Bump bandwidth file version to 1.5.0. + after removing KeyValue recent_measurement_attempt_count in #40023. + Changed also torspec, issue #20. +- V3bwfile: Tor version added in bandwidth v1.4.0. + since, by mistake, the bandwidth file version here was never updated + to v1.5.0. + This patch only changes the constants names, but logic remains the same. + Related to torspec#35. +- Add the bwauths timeline wiki. + Closes #40013. +- Add bwauthealth tool. +- Add consensus health page. + about bwauths measured relays. +- Move consensus weight to top. + and explain what to check. +- 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. +- 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. +- No need to use Travis anymore. +- Clarify branch to use when contributing. +- Maint: Fix linter error after merging #29294. +- Tests: Stop converting boolean key to int. + Conversion only happens when parsing a bandwidth file in the + integration tests. +- Relaylist: filter out private networks. + when checking exit policies to know whether an exit can exit to a port. +- Update authors. +- Replace docs links from Github to Gitlab. +- Update reviewers. +- Replace Github review process to Gitlab. + Replace also Github terminology to Gitlab. +- Replace Trac, ticket by Gitlab, issue. +- Replace links from Trac to Gitlab. +- Start using release script later. + Change the version from which the release script is used. + Also explain the prefixes used in the commits. + Closes #29294 +- Scripts: Clarify the scope of the script. + it should not take more effort than solving self-sbws issues. +- Scripts: Reformat sentence. +- Scripts: Stop bumping to next prerelease version. + since it is now managed automatically by versioneer. + Instead, suggest creating a "next" maintenance branch. + But stop using `-` and `.` characters in it, to type it faster, since + most of the new branches will be based on it. +- Scripts: Stop releasing from -dev0 version. + since now sbws version is calculated from last release tag. +- Scripts: Stop changing version in __init__ + Since it is now done by `versioneer`. +- Scripts: Change Github by Gitlab. + releases can live now in gitlab.tpo, instead of github.com and + there is no need to check them since Gitlab is FLOSS and gitlab.tpo is + hosted by Tor Project. + Also, stop assuming which is the current branch and remote and do not + push. Instead guide the maintainer to do it. +- CI: Add .gitlab-ci.yml to run tests in Gitlab. +- Relaylist: Check exit to all domains/ips. + When an exit policy allows to exit only to some subnet, it is not + enough to check that it can exit to a port, since it can, but it might + not be able to exit to the domain/ip of the sbws Web servers. + To ensure that without having to check whether it can exit to a + specific domain/ip, we can query the exit policy with `strict`. + Closes #40006. Bugfix v1.0.3. +- V3bwfile: Count relay priority lists. + and measurement attempts from all the results. + Until they get properly updated. + Also change dates in tests, so that timestamps are counted correctly +- Recomment maint-1.1 for production. +- Recommend using a CDN, + add link to it and rephrase some sentences. +- Increase RAM required. + ahem, because of all json it has to manage in memory. +- Recommend pip only for development. + or testing and add links. +- Update supported Python versions. +- Comment on Debian/Ubuntu releases. + because sometimes the package might not be in Debian stable or testing + and we are not checking Ubuntu releases. +- Tests: Remove all the `\t` in torrc files. + at the beginning of the line and in empty lines. They are not needed. +- Tests: Create new authority keys. + because they expired. + They will expire again in a year. + Implementing #33150 and using chutney would avoid to update keys. + Closes #34394. +- V3bwfile: linter error with new flake version. +- Add differences between Torflow and sbws. + Closes #33871. +- Update/clarify Torflow aggregation. +- Docs: Remove unneeded linter exception. +- Docs: Move torflow scaling docstring to docs. + so that it has its own page as it is too long as docstring and is + harder to write latex with the docstring syntax. +- Unrelated linter error. +- V3bwfile: Remove unneeded minimum 1. + since rounding already returns 1 as minimum. +- V3bwfile: Use cap argument to clip scaled bw. + Make test pass, though the value is not correct since it needs to be + rounded after clipping +- V3bwfile: cap is never None. +- V3bwfile: Warn about None bandwidth values. + since they are probably due a bug. +- Check that log prints a number. + and not a list of timestamps. +- Assert that caplog messages were found. +- Explain changes in the previous commits. +- Tests: Check the files generated in test net. + Test that the results, state and bandwidth file generated by running + the scanner and the generator in the test network are correct. +- Tests: Add tests loading results. + in ResultDump and incrementing relay's monitoring KeyValues. +- Tests: Add results incrementing relays' + monitoring KeyValues. +- V3bwfile: Stop calculating failures with 0 attempts. +- Relaylist: Count recent relay's monitoring numbers. + using timestamps class. + Additionally: + - fix: relayprioritizer: Replace call relay priority + - fix: scanner: Replace call relay measurement attempt +- State: Let json manage data types. + Since state uses json and json will raise an error when it can't + decode/encode some datatype. +- State: Read file before setting key. + Otherwise, if other instance of state set a key, it's lost by the + current instance. + Bugfix v0.7.0. +- Tests: Test state file consistency. + Test that two different instances of state don't overwrite each other. + This test don't past in this commit, will pass in the next bugfix. + Bugfix v0.7.0, which claimed 100% test coverage on state. +- Tests: linter error cause missing nl. +- Relaylist: Update relay status before consensus. + Update relay status before updating the consensus timestamps + Timestamps that are not old yet were getting removed because the + document.valid_after timestamp was still the one from the previous + consensus. + Closes #33570. +- Tests: Test the number of consensus in Relay. + This test does not pass in this commit, but in the next bugfix. +- Relaylist: Use is_old fn removing consensus. + since the logic is the same and the there were two bugfixes on the + same logic. +- Relaylist: Use seconds removing consensuses. + by default days is passed to timedelta, what was making the oldest + date be thousands of days in the past. + Bugfix 1.1.0. +- Tests: Add relaylist test. + Tests don't pass in this commit, they're fixed in the next commits. +- Tests: Add mocked controller fixture. + to be able to unit test all the code that needs a controller. +- Tests: Add test for remove old consensus ts. + Tests don't pass in this commit, it's fixed in the next commits. +- Timestamp: measurements period is in seconds. + by default days is passed to timedelta, what was making the oldest + date be thousands of days in the past. +- Timestamp: Old timestamps are minor than older. + Old timestamps are minor than the older date, not major. +- Relaylist: Stop passing argument to self.is_old. +- Tests: Add test timestamp.is_old. + The tests don't pass in this commit, it's fixed in the next ones. +- V3bwfile: Reformat to don't get flake8 errors. + Part of #30196 +- V3bwfile: Move keys to correct constant. + Part of #30196. +- V3bwfile: Add comment about bwlines v1.3. + Part of #30196. +- V3bwfile: Add tor_version KeyValue. + + - Create new KeyValues constants for the new v1.5.0 KeyValues + - Instantiate State in Header.from_results so that there is no need + to create new methods for all the header KeyValues that are read + from the state file + - Add tor_version to the kwargs to initialize the Header + - Write tor_version in the state file when the scanner is started +- V3bwfile: Add constant for ordered key/values. + to build the list of all keys from it and ensure no key is missing. +- V3bwfile: Reformat to don't get flake8 errors. + After the automatic constants renaming, fix the flake8 errors by + reformatting automatically with `black`, only the lines that had + errors. + Part of #30196 +- Document why ersioneer to obtain version. +- Add at build time the git revion to version. + Instead of having a hardcoded version, calculate the version at build + time making use of `git describe --tags --dirty --always`. + This way, even if the program is not running from inside a git + repository it still can know which was the git revision from the + source it was installed from. + If the program is launched from a path that is a git repository, it + does not gives the git revision of that other repository. + If's also able to get the version when installed from a tarball. + It does not add the git revision when it's being install from a git + tag. + `versioneer` external program is only needed the first time, because + it copies itself into the repository. So it does not add an external + dependency. + There're no changes needed to the `--version` cli argument nor to the + code that generates the bandwidth file, since they both use the + variable `__version__`. + The version previous to this commit was `1.1.1-dev0`, after + this commit, it becomes `1.1.0+xx.gyyyyyyyy`, ie. xx commits after + `1.1.0` plus the git short hash (yyyyyyyy). +- Tests: Test maximum retry delta in destination. +- Destination: Replace constant name. + to make it consistent with others and shorter. + Part of #33033. +- Destination: Set maximum to retry a destination. + otherwise the time to retry a destination could increase too much, + as it's being multiplied by 2, and a destination would not recover. + Patch submitted by tom. +- Relaylist: linter error after after merge. + Fix linter error after merging #30733 and #30727. +- CI: Cache pip, run tox stats after success. + and do not require sudo. +- CI: Test all supported python versions. + As in chutney and stem: + - Test all supported python versions + - Test all supported tor versions + Differences between chutney, stem and sbws: + - in sbws we run directly, not an script that calls tox + - we're not using chutney for integration tests (yet) and therefore we're not testing it with different networks + - we don't have shellcheck tests + - we don't support osx nor windows +- Relaylist: Update the relays' descriptors. + when fetching new consensuses. + Part of #30733. +- Globals: Fetch descriptors early. + and useless descriptors, so that sbws detect early changes in the relay + descriptors and continue downloading them even when Tor is idle. + +Other +~~~~~ +- Wip: rm me, temporally change release url. + to personal fork, to test the release process +- Fixup! minor: Change info logs to debug or warning. +- Major: Change default log level to info. + also change formatting to show thread. +- Minor: Change log warning to info or debug. + when it contains sensitive information. +- Minor: Change info logs to debug or warning. + when they contain sensitive information, eg. Web server or are too + verbose for the debug level. + Also add log to indicate when the main loop is actually started. +- Revert "fix: stem: Remove torrc option that is the default" + This reverts commit 15da07d6a447d8310354124f6020b4cf74b75488. + Because it's not the default. No additional changes are needed in the + tests. + Closes #40064. +- Minor: scanner: Change logic creating the path. + When the relay is not an exit, instead of choosing exits that can + exit to all IPs, try with exits that can exit to some IPs, since the + relay will be measured again with a different exit in other loop. + When the relay is an exit, instead of ensuring it can exit all IPs, try + using it as exit if it can exit to some IPs. + If it fails connecting to the Web server, then try a 2nd time using it + as entry to avoid that it will fail in all loops if there is only one + Web server, cause it will be used again as an exit. + Also, the helper exits don't need to be able to exit all IPs. When a + helper exit fails to exit (maybe cause it can not exit to the Web + sever IP), it's not a problem cause in a next loop other exit will be + chosen. + This change of logic also solves the bug where non exits were being + used as exits, because we were trying to measure again a relay that + was used as entry, because it could not exit all IPs, which includes + also the non exits. +- Minor: scanner: move checking helper to methods. + `helper` variable is only used to return error, therefore move it to + the methods that create the path and return the error there. + `our_nick` is not useful for the log, since it is always the same, but + not removing it here. +- Vote on the relays with few or close measurements. + to vote on approximately the same numbers of relays as Torflow. + Torflow does not exclude relays with few or close measurements, though + it is possible that because of the way it measures, there are no few + or close measurements. + Closes #34393 +- Doc: fix: Update sbws availabity in OS and links. +- Bug 33009: Require minimum bandwidth for second hop. +- Use freeze_time() in other parts of our tests, too. + When using `_relays_with_flags()` and similar methods it's possible + that tests start to hang without time freezing. See bug 33748 for more + details. We work around this by providing the necessary `freeze_time()` + calls meanwhile. +- Bug 33600: `max_pending_results` is not directly used in `main_loop` +- Fixup! fix: CI: Test all supported python versions. +- Relaylist: stop using the current time when a consensus is downloaded twice. + Instead: + * use the consensus valid-after time, or + * use the supplied timestamp, or + * warn and use the current time. + This should fix the occasional CI failure, when the current time is 1 second + later than the test consensus time. (Or it should warn, and we can fix the + test code.) + Fixes bug 30909; bugfix on 1.1.0. +- V3bwfile: skip relay results when required bandwidths are missing. + Fixes bug 30747; bugfix on 1.1.0. +- Bump to version 1.1.1-dev0. + v1.1.0 (2019-03-27) -------------------

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 16 Apr '21

16 Apr '21

1 0

[sbws/master] fix: Clarify release script dependencies
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 99505e2c3ee182158cb201094dc84f9b28298fa6 Author: juga0 <juga(a)riseup.net> Date: Wed Apr 14 08:32:15 2021 +0000 fix: Clarify release script dependencies --- scripts/maint/release.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/maint/release.py b/scripts/maint/release.py index 17f5788..1ca4ba6 100755 --- a/scripts/maint/release.py +++ b/scripts/maint/release.py @@ -41,12 +41,15 @@ import sys try: import semantic_version except ImportError: - print("Please, install semantic_version") + print( + "Please, install semantic_version: " + "`apt install python3-semantic-version` or " + "`pip install semantic_version`") sys.exit(1) try: import gitchangelog # noqa except ImportError: - print("Please, install gitchangelog") + print("Please, install gitchangelog: `pip install gitchangelog`") sys.exit(1) import sbws

1 0

[sbws/master] fix: CI: Create release on tag
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 316d67fe132bc774ba7bff20ddf298aa947bce98 Author: juga0 <juga(a)riseup.net> Date: Fri Apr 16 09:51:13 2021 +0000 fix: CI: Create release on tag --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d352153..1a9ad10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,3 +131,20 @@ python310: - tox -e py310 - tox -e integration allow_failure: true + +release_job: + before_script: + - echo "Nothing" + after_script: + - echo "Nothing" + image: registry.gitlab.com/gitlab-org/release-cli:latest + only: [tags] + script: + - echo "Running release job." + release: + name: "Release $CI_COMMIT_TAG" + description: "Created using release-cli" + tag_name: "$CI_COMMIT_TAG" + ref: "$CI_COMMIT_TAG" + milestones: + - "sbws: 1.1.x-final"

1 0

[sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1
by juga＠torproject.org 16 Apr '21

16 Apr '21

1 0

[sbws/maint-1.1] fix: doc: Clarify Torflow aggregation
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 664742c40fa82d0f907b63e5c7c2157a03859993 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 22 10:45:12 2021 +0000 fix: doc: Clarify Torflow aggregation Closes #40082. --- docs/source/torflow_aggr.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/torflow_aggr.rst b/docs/source/torflow_aggr.rst index a79c3c8..a45dac8 100644 --- a/docs/source/torflow_aggr.rst +++ b/docs/source/torflow_aggr.rst @@ -305,7 +305,7 @@ In Torflow's `aggregate.py`_ code:: So:: - n.ratio = max(sbw_ratio, n.fbw_ratio) + n.ratio = max(n.sbw_ratio, n.fbw_ratio) This is also expressed in pseudocode in the `bandwidth file spec`_, section B.4 step 2 and 3. @@ -329,7 +329,7 @@ So:: n.new_bw = ( min(bandwidth-avg, bandwidth-observed) or 1 \ - * max(bwstrm_i / bwstrm, bwfilt_i / bwfilt_i) + * max(bwstrm_i / bwstrm, bwfilt_i / bwfilt) ) This is also expressed in pseudocode in the `bandwidth file spec`_, section B.4

1 0

[sbws/maint-1.1] fix: doc: Replace md by rst and rm dep
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 8cfd99786f6a70c9d7d60e0d300b546a2397e7c1 Author: juga0 <juga(a)riseup.net> Date: Wed Apr 14 15:53:05 2021 +0000 fix: doc: Replace md by rst and rm dep Get rid of the last documentation in markdown and remove extra dependency! --- AUTHORS.md => AUTHORS.rst | 16 +++--- LICENSE.md | 39 -------------- LICENSE.rst | 125 ++++++++++++++++++++++++++++++++++++++++++++ README.md | 71 ------------------------- README.rst | 74 ++++++++++++++++++++++++++ docs/source/AUTHORS.md | 1 - docs/source/AUTHORS.rst | 1 + docs/source/README.md | 1 - docs/source/README.rst | 1 + docs/source/conf.py | 4 -- docs/source/documenting.rst | 5 +- setup.cfg | 1 - 12 files changed, 211 insertions(+), 128 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.rst similarity index 50% rename from AUTHORS.md rename to AUTHORS.rst index 1e8641e..d4b2276 100644 --- a/AUTHORS.md +++ b/AUTHORS.rst @@ -1,14 +1,14 @@ Authors ======= -The following people have contributed to Simple Bandwidth Scanner. -Thank you for helping make Tor better. +The following people have contributed to Simple Bandwidth Scanner. Thank +you for helping make Tor better. -* anadahz -* George Kadianakis -* Georg Koppen -* juga -* Matt Traudt -* teor +- anadahz +- George Kadianakis +- Georg Koppen +- juga +- Matt Traudt +- teor *Last updated: 2020-06-26 on d7a822bf* diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index b823bcc..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,39 +0,0 @@ -CC0 1.0 Universal -================== - -Statement of Purpose ---------------------- - -The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. --------------------------------- -A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: - -i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; -ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; -iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; -v. rights protecting the extraction, dissemination, use and reuse of data in a Work; -vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and -vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. ------------ -To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equ itable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. ----------------------------- -Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. - -4. Limitations and Disclaimers. --------------------------------- - -a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. -b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. -c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. -d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. diff --git a/LICENSE.rst b/LICENSE.rst new file mode 100644 index 0000000..671202b --- /dev/null +++ b/LICENSE.rst @@ -0,0 +1,125 @@ +CC0 1.0 Universal +================= + +Statement of Purpose +-------------------- + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an “owner”) of an original work +of authorship and/or a database (each, a “Work”). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works (“Commons”) that the public can reliably and without +fear of later claims of infringement build upon, modify, incorporate in +other works, reuse and redistribute as freely as possible in any form +whatsoever and for any purposes, including without limitation commercial +purposes. These owners may contribute to the Commons to promote the +ideal of a free culture and the further production of creative, cultural +and scientific works, or to gain reputation or greater distribution for +their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the “Affirmer”), to the extent that he or +she is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under +its terms, with knowledge of his or her Copyright and Related Rights in +the Work and the meaning and intended legal effect of CC0 on those +rights. + +1. Copyright and Related Rights. +-------------------------------- + +A Work made available under CC0 may be protected by copyright and +related or neighboring rights (“Copyright and Related Rights”). +Copyright and Related Rights include, but are not limited to, the +following: + +i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; +ii. moral rights retained by the original author(s) and/or + performer(s); +iii. publicity and privacy rights pertaining to a person’s image or + likeness depicted in a Work; +iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; +v. rights protecting the extraction, dissemination, use and reuse of + data in a Work; +vi. database rights (such as those arising under Directive 96/9/EC of + the European Parliament and of the Council of 11 March 1996 on the + legal protection of databases, and under any national + implementation thereof, including any amended or successor version + of such directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. +---------- + +To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably +and unconditionally waives, abandons, and surrenders all of Affirmer’s +Copyright and Related Rights and associated claims and causes of action, +whether now known or unknown (including existing as well as future +claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any purpose +whatsoever, including without limitation commercial, advertising or +promotional purposes (the “Waiver”). Affirmer makes the Waiver for the +benefit of each member of the public at large and to the detriment of +Affirmer’s heirs and successors, fully intending that such Waiver shall +not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of +the Work by the public as contemplated by Affirmer’s express Statement +of Purpose. + +3. Public License Fallback. +--------------------------- + +Should any part of the Waiver for any reason be judged legally invalid +or ineffective under applicable law, then the Waiver shall be preserved +to the maximum extent permitted taking into account Affirmer’s express +Statement of Purpose. In addition, to the extent the Waiver is so judged +Affirmer hereby grants to each affected person a royalty-free, non +transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer’s Copyright and Related +Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any +number of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +“License”). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, +such partial invalidity or ineffectiveness shall not invalidate the +remainder of the License, and in such case Affirmer hereby affirms that +he or she will not (i) exercise any of his or her remaining Copyright +and Related Rights in the Work or (ii) assert any associated claims and +causes of action with respect to the Work, in either case contrary to +Affirmer’s express Statement of Purpose. + +4. Limitations and Disclaimers. +------------------------------- + +a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. +b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. +c. Affirmer disclaims responsibility for clearing rights of other + persons that may apply to the Work or any use thereof, including + without limitation any person’s Copyright and Related Rights in the + Work. Further, Affirmer disclaims responsibility for obtaining any + necessary consents, permissions or other rights required for any use + of the Work. +d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/README.md b/README.md deleted file mode 100644 index fe12cba..0000000 --- a/README.md +++ /dev/null @@ -1,71 +0,0 @@ -Readme -====== - -[![Build Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://t… - -Simple Bandwidth Scanner (called `sbws`) is a Tor bandwidth scanner that -generates bandwidth files to be used by Directory Authorities. - -The scanner measures the bandwidth of each relay in the Tor network -(except the directory authorities) by creating a two hops circuit -with the relay. It then measures the bandwidth by downloading data -from a destination Web Server and stores the measurements. - -The generator read the measurements, aggregates, filters and -scales them using torflow's scaling method. -Then it generates a bandwidth list file that is read -by a directory authority to report relays’ bandwidth in its vote. - -**WARNING**: This software is intended to be run by researchers using a test -Tor network, such as chutney or shadow, or by the Tor bandwidth authorities -on the public Tor network. -Please do not run this software on the public Tor network unless you are one -of the Tor bandwidth authorities, to avoid creating unnecessary traffic. - -**ADVICE**: It is recommended to read this documentation at -[Read the Docs](https://sbws.rtfd.io). In -[Tor Project Gitlab](https://gitlab.torproject.org/tpo/network-health/sbws) -(tpo Gitlab) some links won't be properly rendered. -It can also be read after installing the Debian package ``sbws-doc`` in -``/usr/share/doc/sbws`` or after building it locally as explained in -``./docs/source/documenting.rst``. - - -Installing ------------- - -See [./INSTALL.rst](INSTALL.rst) (in local directory or tpo Gitlab) or -[INSTALL.html](INSTALL.html) (local build or Read the Docs). - -Deploying and running ---------------------- - -See [./DEPLOY.rst](DEPLOY.rst) (in local directory or tpo Gitlab) or -[DEPLOY.html](DEPLOY.html) (local build or Read the Docs). - -Changelog --------------- - -See [./CHANGELOG.rst](CHANGELOG.rst) (in local directory or tpo Gitlab) or -[CHANGELOG.html](CHANGELOG.html) (local build or Read the Docs). - -Documentation --------------- - -More extensive documentation can be found in the ``./docs`` directory, -and online at [sbws.rtfd.io](https://sbws.readthedocs.io). - -## License - -This work is in the public domain within the United States. - -We waive copyright and related rights in the work worldwide through the -[CC0-1.0 license](https://creativecommons.org/publicdomain/zero/1.0). - -You can find a copy of the CC0 Public Domain Dedication along with this -software in ./LICENSE.md - -## Authors - -See [./AUTHORS.md](AUTHORS.md) (in local directory or tpo Gitlab) or -[AUTHORS.html](AUTHORS.html) (local build or Read the Docs). diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..8849cac --- /dev/null +++ b/README.rst @@ -0,0 +1,74 @@ +Readme +====== + +`Build +Status <https://travis-ci.org/https://travis-ci.org/torproject/sbws>`__ + +Simple Bandwidth Scanner (called ``sbws``) is a Tor bandwidth scanner +that generates bandwidth files to be used by Directory Authorities. + +The scanner measures the bandwidth of each relay in the Tor network +(except the directory authorities) by creating a two hops circuit with +the relay. It then measures the bandwidth by downloading data from a +destination Web Server and stores the measurements. + +The generator read the measurements, aggregates, filters and scales them +using torflow’s scaling method. Then it generates a bandwidth list file +that is read by a directory authority to report relays’ bandwidth in its +vote. + +**WARNING**: This software is intended to be run by researchers using a +test Tor network, such as chutney or shadow, or by the Tor bandwidth +authorities on the public Tor network. Please do not run this software +on the public Tor network unless you are one of the Tor bandwidth +authorities, to avoid creating unnecessary traffic. + +**ADVICE**: It is recommended to read this documentation at `Read the +Docs <https://sbws.rtfd.io>`__. In `Tor Project +Gitlab <https://gitlab.torproject.org/tpo/network-health/sbws>`__ (tpo +Gitlab) some links won’t be properly rendered. It can also be read after +installing the Debian package ``sbws-doc`` in ``/usr/share/doc/sbws`` or +after building it locally as explained in +``./docs/source/documenting.rst``. + +Installing +---------- + +See `./INSTALL.rst <INSTALL.rst>`__ (in local directory or tpo Gitlab) +or `INSTALL.html <INSTALL.html>`__ (local build or Read the Docs). + +Deploying and running +--------------------- + +See `./DEPLOY.rst <DEPLOY.rst>`__ (in local directory or tpo Gitlab) or +`DEPLOY.html <DEPLOY.html>`__ (local build or Read the Docs). + +Changelog +--------- + +See `./CHANGELOG.rst <CHANGELOG.rst>`__ (in local directory or tpo +Gitlab) or `CHANGELOG.html <CHANGELOG.html>`__ (local build or Read the +Docs). + +Documentation +------------- + +More extensive documentation can be found in the ``./docs`` directory, +and online at `sbws.rtfd.io <https://sbws.readthedocs.io>`__. + +License +------- + +This work is in the public domain within the United States. + +We waive copyright and related rights in the work worldwide through the +`CC0-1.0 license <https://creativecommons.org/publicdomain/zero/1.0>`__. + +You can find a copy of the CC0 Public Domain Dedication along with this +software in ./LICENSE.md + +Authors +------- + +See `./AUTHORS.md <AUTHORS.md>`__ (in local directory or tpo Gitlab) or +`AUTHORS.html <AUTHORS.html>`__ (local build or Read the Docs). diff --git a/docs/source/AUTHORS.md b/docs/source/AUTHORS.md deleted file mode 120000 index 2d2e840..0000000 --- a/docs/source/AUTHORS.md +++ /dev/null @@ -1 +0,0 @@ -../../AUTHORS.md \ No newline at end of file diff --git a/docs/source/AUTHORS.rst b/docs/source/AUTHORS.rst new file mode 120000 index 0000000..4968901 --- /dev/null +++ b/docs/source/AUTHORS.rst @@ -0,0 +1 @@ +../../AUTHORS.rst \ No newline at end of file diff --git a/docs/source/README.md b/docs/source/README.md deleted file mode 120000 index fe84005..0000000 --- a/docs/source/README.md +++ /dev/null @@ -1 +0,0 @@ -../../README.md \ No newline at end of file diff --git a/docs/source/README.rst b/docs/source/README.rst new file mode 120000 index 0000000..c768ff7 --- /dev/null +++ b/docs/source/README.rst @@ -0,0 +1 @@ +../../README.rst \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index 1f33c71..d242147 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -197,8 +197,4 @@ epub_exclude_files = ['search.html'] # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = True -source_parsers = { - '.md': 'recommonmark.parser.CommonMarkParser', -} - numfig = True diff --git a/docs/source/documenting.rst b/docs/source/documenting.rst index bc74dae..8dd31f0 100644 --- a/docs/source/documenting.rst +++ b/docs/source/documenting.rst @@ -6,7 +6,6 @@ Installing and building the documentation To build the documentation, extra Python dependencies are needed: - Sphinx_ -- recommonmark_ - Pylint_ (only to update the diagrams) To install them from ``sbws``:: @@ -43,7 +42,7 @@ They are included in most distributions. In Debian install them running:: .. _Sphinx: https://www.sphinx-doc.org -.. _recommonmark: https://recommonmark.readthedocs.io/ .. _Pylint: https://www.pylint.org/ .. _Tex: https://www.tug.org/texlive/acquire.html -.. _dvipng: https://www.nongnu.org/dvipng/ \ No newline at end of file +.. _dvipng: https://www.nongnu.org/dvipng/ + diff --git a/setup.cfg b/setup.cfg index 2ba9548..0074a1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,7 +53,6 @@ test = doc = sphinx pylint - recommonmark dev = flake8 flake8-docstrings

1 0

[sbws/maint-1.1] Merge branch 'bug_40082' into 'maint-1.1'
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 36d96da7c36b6c02751eb7697b17d78cdea8f2e6 Merge: 37d5c0a 664742c Author: juga <juga(a)riseup.net> Date: Mon Mar 22 16:30:43 2021 +0000 Merge branch 'bug_40082' into 'maint-1.1' fix: doc: Clarify Torflow aggregation Closes #40082 See merge request tpo/network-health/sbws!80 docs/source/torflow_aggr.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[sbws/maint-1.1] fix: Use rst changelog template
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit bda888e9d9fdeb38dd9c1a121d113c0918f4d049 Author: juga0 <juga(a)riseup.net> Date: Fri Apr 9 10:17:46 2021 +0000 fix: Use rst changelog template and put in the same entry commit subject and body removing new lines. Closes: #40004 --- .gitchangelog.rc | 3 ++- .gitchangelogrst.tpl | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitchangelog.rc b/.gitchangelog.rc index 264e5d7..9024f24 100644 --- a/.gitchangelog.rc +++ b/.gitchangelog.rc @@ -187,7 +187,8 @@ unreleased_version_label = "Unreleased" ## Examples: ## - makotemplate("restructuredtext") ## -output_engine = rest_py +#output_engine = rest_py +output_engine = makotemplate(".gitchangelogrst.tpl") #output_engine = mustache("restructuredtext") #output_engine = mustache("markdown") #output_engine = makotemplate("restructuredtext") diff --git a/.gitchangelogrst.tpl b/.gitchangelogrst.tpl index 46f02a3..d0ba6ce 100644 --- a/.gitchangelogrst.tpl +++ b/.gitchangelogrst.tpl @@ -19,15 +19,11 @@ ${section["label"]} ${"~" * len(section["label"])} % endif % for commit in section["commits"]: -<% -subject = "%s [%s]" % (commit["subject"], ", ".join(commit["authors"])) -entry = indent('\n'.join(textwrap.wrap(subject)), - first="- ").strip() +<% c = commit["subject"] +if commit["body"]: + c += "\n" + commit["body"].replace("\n\n", "\n") +entry = indent(c, first="- ").strip() %>${entry} - -% if commit["body"]: -${indent(commit["body"])} -% endif % endfor % endfor

1 0