From cc402487d96076b4b3217bf561d780e83d60fcfa Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Mon, 24 Jun 2024 10:48:13 -0700 Subject: [PATCH 1/2] Minor development documentation clarifications. --- docs/how-to/develop-on-borgmatic.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/how-to/develop-on-borgmatic.md b/docs/how-to/develop-on-borgmatic.md index 327038a..71db8bb 100644 --- a/docs/how-to/develop-on-borgmatic.md +++ b/docs/how-to/develop-on-borgmatic.md @@ -102,9 +102,9 @@ and depend on containers for runtime dependencies. These tests do run on the continuous integration (CI) server, and running them on your developer machine is the closest thing to dev-CI parity. -If you would like to run the full test suite, first install Docker (or Podman; -see below) and [Docker Compose](https://docs.docker.com/compose/install/). -Then run: +If you would like to run the end-to-end tests, first install Docker (or +Podman; see below) and [Docker +Compose](https://docs.docker.com/compose/install/). Then run: ```bash scripts/run-end-to-end-tests @@ -152,12 +152,14 @@ the following deviations from it: * In general, spell out words in variable names instead of shortening them. So, think `index` instead of `idx`. There are some notable exceptions to this though (like `config`). + * Favor blank lines around `if` statements, `return`s, logical code groupings, + etc. Readability is more important than packing the code tightly. borgmatic code uses the [Black](https://black.readthedocs.io/en/stable/) code formatter, the [Flake8](http://flake8.pycqa.org/en/latest/) code checker, and the [isort](https://github.com/timothycrosley/isort) import orderer, so -certain code style requirements will be enforced when running automated tests. -See the Black, Flake8, and isort documentation for more information. +certain code style requirements are enforced when running automated tests. See +the Black, Flake8, and isort documentation for more information. ## Continuous integration From ebde88ccaa70d24d7c7346ae3f22d1709502cc83 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Tue, 25 Jun 2024 12:45:44 -0700 Subject: [PATCH 2/2] Fix the Healthchecks ping body size limit, restoring it to the documented 100,000 bytes (#889). --- NEWS | 3 ++- borgmatic/hooks/healthchecks.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 700b568..94a14e6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 1.8.13.dev0 - * #886: Fix PagerDuty hook traceback with Python < 3.10. + * #886: Fix a PagerDuty hook traceback with Python < 3.10. + * #889: Fix the Healthchecks ping body size limit, restoring it to the documented 100,000 bytes. 1.8.12 * #817: Add a "--max-duration" flag to the "check" action and a "max_duration" option to the diff --git a/borgmatic/hooks/healthchecks.py b/borgmatic/hooks/healthchecks.py index f7daf67..73d4eec 100644 --- a/borgmatic/hooks/healthchecks.py +++ b/borgmatic/hooks/healthchecks.py @@ -15,7 +15,7 @@ MONITOR_STATE_TO_HEALTHCHECKS = { monitor.State.LOG: 'log', } -DEFAULT_PING_BODY_LIMIT_BYTES = 1500 +DEFAULT_PING_BODY_LIMIT_BYTES = 100000 HANDLER_IDENTIFIER = 'healthchecks'