Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package borgmatic for openSUSE:Factory checked in at 2021-04-01 14:17:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/borgmatic (Old) and /work/SRC/openSUSE:Factory/.borgmatic.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgmatic" Thu Apr 1 14:17:46 2021 rev:26 rq:882329 version:1.5.13 Changes: -------- --- /work/SRC/openSUSE:Factory/borgmatic/borgmatic.changes 2021-02-10 21:30:58.686335768 +0100 +++ /work/SRC/openSUSE:Factory/.borgmatic.new.2401/borgmatic.changes 2021-04-01 14:19:03.808136028 +0200 @@ -1,0 +2,16 @@ +Wed Mar 31 10:08:00 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to 1.5.13: + * #373: Document that passphrase is used for Borg keyfile encryption, + not just repokey encryption. + * #404: Add support for ruamel.yaml 0.17.x YAML parsing library. + * Update systemd service example to return a permission error when + a system call isn't permitted + (instead of terminating borgmatic outright). + * Drop support for Python 3.5, which has been end-of-lifed. + * Add support for Python 3.9. + * Only support black code formatter on Python 3.8+. +- Drop 0001-Update-versions-of-test-dependencies.patch +- Rebase skip-tests.patch + +------------------------------------------------------------------- Old: ---- 0001-Update-versions-of-test-dependencies.patch borgmatic-1.5.12.tar.gz New: ---- borgmatic-1.5.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ borgmatic.spec ++++++ --- /var/tmp/diff_new_pack.dFpQOP/_old 2021-04-01 14:19:04.352136754 +0200 +++ /var/tmp/diff_new_pack.dFpQOP/_new 2021-04-01 14:19:04.356136759 +0200 @@ -17,7 +17,7 @@ Name: borgmatic -Version: 1.5.12 +Version: 1.5.13 Release: 0 Summary: Automation tool for borgbackup License: GPL-3.0-only @@ -25,13 +25,11 @@ URL: https://torsion.org/borgmatic/ Source: https://github.com/witten/borgmatic/archive/%{version}.tar.gz#/borgmatic-%{version}.tar.gz Patch1: skip-tests.patch -# PATCH-FIX-UPSTREAM 0001-Update-versions-of-test-dependencies.patch -- alarr...@suse.com -Patch2: 0001-Update-versions-of-test-dependencies.patch # testing requirements BuildRequires: borgbackup # To create the manpage BuildRequires: pandoc -BuildRequires: python3 >= 3.4 +BuildRequires: python3 >= 3.6 BuildRequires: python3-PyYAML BuildRequires: python3-appdirs BuildRequires: python3-atomicwrites @@ -77,7 +75,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 sed -i -e "s/colorama>=0.4.1,<0.5/colorama>=0.3.9/" setup.py %if 0%{?suse_version} <= 1500 ++++++ borgmatic-1.5.12.tar.gz -> borgmatic-1.5.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/.drone.yml new/borgmatic-1.5.13/.drone.yml --- old/borgmatic-1.5.12/.drone.yml 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/.drone.yml 2021-03-31 00:53:19.000000000 +0200 @@ -1,10 +1,10 @@ --- kind: pipeline -name: python-3-5-alpine-3-10 +name: python-3-6-alpine-3-9 services: - name: postgresql - image: postgres:11.6-alpine + image: postgres:11.9-alpine environment: POSTGRES_PASSWORD: test POSTGRES_DB: test @@ -16,29 +16,7 @@ steps: - name: build - image: python:3.5-alpine3.10 - pull: always - commands: - - scripts/run-full-tests ---- -kind: pipeline -name: python-3-6-alpine-3-10 - -services: - - name: postgresql - image: postgres:11.6-alpine - environment: - POSTGRES_PASSWORD: test - POSTGRES_DB: test - - name: mysql - image: mariadb:10.3 - environment: - MYSQL_ROOT_PASSWORD: test - MYSQL_DATABASE: test - -steps: -- name: build - image: python:3.6-alpine3.10 + image: alpine:3.9 pull: always commands: - scripts/run-full-tests @@ -48,7 +26,7 @@ services: - name: postgresql - image: postgres:11.6-alpine + image: postgres:11.9-alpine environment: POSTGRES_PASSWORD: test POSTGRES_DB: test @@ -60,51 +38,29 @@ steps: - name: build - image: python:3.7-alpine3.10 + image: alpine:3.10 pull: always commands: - scripts/run-full-tests --- kind: pipeline -name: python-3-7-alpine-3-7 +name: python-3-8-alpine-edge services: - name: postgresql - image: postgres:10.11-alpine + image: postgres:13.1-alpine environment: POSTGRES_PASSWORD: test POSTGRES_DB: test - name: mysql - image: mariadb:10.1 - environment: - MYSQL_ROOT_PASSWORD: test - MYSQL_DATABASE: test - -steps: -- name: build - image: python:3.7-alpine3.7 - pull: always - commands: - - scripts/run-full-tests ---- -kind: pipeline -name: python-3-8-alpine-3-10 - -services: - - name: postgresql - image: postgres:11.6-alpine - environment: - POSTGRES_PASSWORD: test - POSTGRES_DB: test - - name: mysql - image: mariadb:10.3 + image: mariadb:10.5 environment: MYSQL_ROOT_PASSWORD: test MYSQL_DATABASE: test steps: - name: build - image: python:3.8-alpine3.10 + image: alpine:edge pull: always commands: - scripts/run-full-tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/NEWS new/borgmatic-1.5.13/NEWS --- old/borgmatic-1.5.12/NEWS 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/NEWS 2021-03-31 00:53:19.000000000 +0200 @@ -1,3 +1,15 @@ +1.5.13 + * #373: Document that passphrase is used for Borg keyfile encryption, not just repokey encryption. + * #404: Add support for ruamel.yaml 0.17.x YAML parsing library. + * Update systemd service example to return a permission error when a system call isn't permitted + (instead of terminating borgmatic outright). + * Drop support for Python 3.5, which has been end-of-lifed. + * Add support for Python 3.9. + * Update versions of test dependencies (test_requirements.txt and test containers). + * Only support black code formatter on Python 3.8+. New black dependencies make installation + difficult on older versions of Python. + * Replace "improve this documentation" form with link to support and ticket tracker. + 1.5.12 * Fix for previous release with incorrect version suffix in setup.py. No other changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/borgmatic/config/schema.yaml new/borgmatic-1.5.13/borgmatic/config/schema.yaml --- old/borgmatic-1.5.12/borgmatic/config/schema.yaml 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/borgmatic/config/schema.yaml 2021-03-31 00:53:19.000000000 +0200 @@ -185,19 +185,20 @@ desc: | The standard output of this command is used to unlock the encryption key. Only use on repositories that were - initialized with passcommand/repokey encryption. Note that - if both encryption_passcommand and encryption_passphrase are - set, then encryption_passphrase takes precedence. Defaults - to not set. + initialized with passcommand/repokey/keyfile encryption. + Note that if both encryption_passcommand and + encryption_passphrase are set, then encryption_passphrase + takes precedence. Defaults to not set. example: "secret-tool lookup borg-repository repo-name" encryption_passphrase: type: str desc: | Passphrase to unlock the encryption key with. Only use on - repositories that were initialized with passphrase/repokey - encryption. Quote the value if it contains punctuation, so - it parses correctly. And backslash any quote or backslash - literals as well. Defaults to not set. + repositories that were initialized with + passphrase/repokey/keyfile encryption. Quote the value if it + contains punctuation, so it parses correctly. And backslash + any quote or backslash literals as well. Defaults to not + set. example: "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" checkpoint_interval: type: int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/Dockerfile new/borgmatic-1.5.13/docs/Dockerfile --- old/borgmatic-1.5.12/docs/Dockerfile 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/Dockerfile 2021-03-31 00:53:19.000000000 +0200 @@ -1,4 +1,4 @@ -FROM python:3.8.1-alpine3.11 as borgmatic +FROM python:3.8-alpine3.12 as borgmatic COPY . /app RUN pip install --no-cache /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml @@ -7,7 +7,7 @@ echo -e "\n--------------------------------------------------------------------------------\n" >> /command-line.txt \ && borgmatic "$action" --help >> /command-line.txt; done -FROM node:13.7.0-alpine as html +FROM node:15.2.1-alpine as html ARG ENVIRONMENT=production @@ -26,7 +26,7 @@ RUN NODE_ENV=${ENVIRONMENT} npx eleventy --input=/source/docs --output=/output/docs \ && mv /output/docs/index.html /output/index.html -FROM nginx:1.16.1-alpine +FROM nginx:1.19.4-alpine COPY --from=html /output /usr/share/nginx/html COPY --from=borgmatic /etc/borgmatic/config.yaml /usr/share/nginx/html/docs/reference/config.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/_includes/components/suggestion-form.css new/borgmatic-1.5.13/docs/_includes/components/suggestion-form.css --- old/borgmatic-1.5.12/docs/_includes/components/suggestion-form.css 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/_includes/components/suggestion-form.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#suggestion-form textarea { - font-family: sans-serif; - width: 100%; -} - -#suggestion-form label { - font-weight: bold; -} - -#suggestion-form input[type=email] { - font-size: 16px; - width: 100%; -} - -#suggestion-form .form-error { - color: red; -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/_includes/components/suggestion-form.html new/borgmatic-1.5.13/docs/_includes/components/suggestion-form.html --- old/borgmatic-1.5.12/docs/_includes/components/suggestion-form.html 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/_includes/components/suggestion-form.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -<h2>Improve this documentation</h2> - -<p>Have an idea on how to make this documentation even better? Send your -feedback below! But if you need help with borgmatic, or have an idea for a -borgmatic feature, please use our <a href="https://torsion.org/borgmatic/#issues";>issue -tracker</a> instead.</p> - -<form id="suggestion-form"> - <div><label for="suggestion">Documentation suggestion</label></div> - <textarea id="suggestion" rows="8" cols="60" name="suggestion"></textarea> - <div data-sk-error="suggestion" class="form-error"></div> - <input id="_page" type="hidden" name="_page"> - <input id="_subject" type="hidden" name="_subject" value="borgmatic documentation suggestion"> - <br /> - <label for="email">Email address</label> - <div><input id="email" type="email" name="email" placeholder="Only required if you want a response!"></div> - <div data-sk-error="email" class="form-error"></div> - <br /> - <div><button type="submit">Send</button></div> - <br /> -</form> - -<script> - document.getElementById('_page').value = window.location.href; - window.sk=window.sk||function(){(sk.q=sk.q||[]).push(arguments)}; - - sk('form', 'init', { - id: '1d536680ab96', - element: '#suggestion-form' - }); -</script> - -<script defer src="https://js.statickit.com/statickit.js";></script> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/_includes/components/suggestion-link.html new/borgmatic-1.5.13/docs/_includes/components/suggestion-link.html --- old/borgmatic-1.5.12/docs/_includes/components/suggestion-link.html 1970-01-01 01:00:00.000000000 +0100 +++ new/borgmatic-1.5.13/docs/_includes/components/suggestion-link.html 2021-03-31 00:53:19.000000000 +0200 @@ -0,0 +1,17 @@ +<h2>Improve this documentation</h2> + +<p>Have an idea on how to make this documentation even better? Use our <a +href="https://projects.torsion.org/witten/borgmatic/issues";>issue tracker</a> to send your +feedback!</p> + +<script> + document.getElementById('_page').value = window.location.href; + window.sk=window.sk||function(){(sk.q=sk.q||[]).push(arguments)}; + + sk('form', 'init', { + id: '1d536680ab96', + element: '#suggestion-form' + }); +</script> + +<script defer src="https://js.statickit.com/statickit.js";></script> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/_includes/layouts/base.njk new/borgmatic-1.5.13/docs/_includes/layouts/base.njk --- old/borgmatic-1.5.12/docs/_includes/layouts/base.njk 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/_includes/layouts/base.njk 2021-03-31 00:53:19.000000000 +0200 @@ -11,7 +11,6 @@ {% include 'components/minilink.css' %} {% include 'components/toc.css' %} {% include 'components/info-blocks.css' %} -{% include 'components/suggestion-form.css' %} {% include 'prism-theme.css' %} {% include 'asciinema.css' %} {% endset %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/_includes/layouts/main.njk new/borgmatic-1.5.13/docs/_includes/layouts/main.njk --- old/borgmatic-1.5.12/docs/_includes/layouts/main.njk 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/_includes/layouts/main.njk 2021-03-31 00:53:19.000000000 +0200 @@ -28,5 +28,5 @@ {{ content | safe }} - {% include 'components/suggestion-form.html' %} + {% include 'components/suggestion-link.html' %} </main> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/docs/how-to/set-up-backups.md new/borgmatic-1.5.13/docs/how-to/set-up-backups.md --- old/borgmatic-1.5.12/docs/how-to/set-up-backups.md 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/docs/how-to/set-up-backups.md 2021-03-31 00:53:19.000000000 +0200 @@ -139,8 +139,8 @@ ### Encryption -If you encrypt your Borg repository with a passphrase instead of a key file, -you'll either need to set the borgmatic `encryption_passphrase` configuration +If you encrypt your Borg repository with a passphrase or a key file, you'll +either need to set the borgmatic `encryption_passphrase` configuration variable or set the `BORG_PASSPHRASE` environment variable. See the [repository encryption section](https://borgbackup.readthedocs.io/en/stable/quickstart.html#repository-encryption) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/sample/systemd/borgmatic.service new/borgmatic-1.5.13/sample/systemd/borgmatic.service --- old/borgmatic-1.5.12/sample/systemd/borgmatic.service 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/sample/systemd/borgmatic.service 2021-03-31 00:53:19.000000000 +0200 @@ -7,9 +7,9 @@ [Service] Type=oneshot -# Security settings for systemd running as root -# For more details about this settings check the systemd manuals -# https://www.freedesktop.org/software/systemd/man/systemd.exec.html +# Security settings for systemd running as root, optional but recommended to improve security. You +# can disable individual settings if they cause problems for your use case. For more details, see +# the systemd manual: https://www.freedesktop.org/software/systemd/man/systemd.exec.html LockPersonality=true # Certain borgmatic features like Healthchecks integration need MemoryDenyWriteExecute to be off. # But you can try setting it to "yes" for improved security if you don't use those features. @@ -29,6 +29,7 @@ RestrictSUIDSGID=yes SystemCallArchitectures=native SystemCallFilter=@system-service +SystemCallErrorNumber=EPERM # Restrict write access # Change to 'ProtectSystem=strict' and uncomment 'ProtectHome' to make the whole file # system read-only be default and uncomment 'ReadWritePaths' for the required write access. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/scripts/release new/borgmatic-1.5.13/scripts/release --- old/borgmatic-1.5.12/scripts/release 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/scripts/release 2021-03-31 00:53:19.000000000 +0200 @@ -15,6 +15,12 @@ fi version=$(head --lines=1 NEWS) + +if [[ $version =~ .*dev* ]]; then + echo "Refusing to release a dev version: $version" + exit 1 +fi + git tag $version git push origin $version git push github $version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/scripts/run-full-tests new/borgmatic-1.5.13/scripts/run-full-tests --- old/borgmatic-1.5.12/scripts/run-full-tests 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/scripts/run-full-tests 2021-03-31 00:53:19.000000000 +0200 @@ -10,9 +10,11 @@ set -e -python -m pip install --upgrade pip==20.0.2 -pip install tox==3.14.3 +apk add --no-cache python3 py3-pip borgbackup postgresql-client mariadb-client +# If certain dependencies of black are available in this version of Alpine, install them. +apk add --no-cache py3-typed-ast py3-regex || true +python3 -m pip install --upgrade pip==20.2.4 setuptools==50.3.2 +pip3 install tox==3.20.1 export COVERAGE_FILE=/tmp/.coverage -tox --workdir /tmp/.tox -apk add --no-cache borgbackup postgresql-client mariadb-client -tox --workdir /tmp/.tox -e end-to-end +tox --workdir /tmp/.tox --sitepackages +tox --workdir /tmp/.tox --sitepackages -e end-to-end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/setup.cfg new/borgmatic-1.5.13/setup.cfg --- old/borgmatic-1.5.12/setup.cfg 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/setup.cfg 2021-03-31 00:53:19.000000000 +0200 @@ -1,5 +1,5 @@ [metadata] -description-file=README.md +description_file=README.md [tool:pytest] testpaths = tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/setup.py new/borgmatic-1.5.13/setup.py --- old/borgmatic-1.5.12/setup.py 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/setup.py 2021-03-31 00:53:19.000000000 +0200 @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -VERSION = '1.5.12' +VERSION = '1.5.13' setup( @@ -32,7 +32,7 @@ install_requires=( 'pykwalify>=1.6.0,<14.06', 'requests', - 'ruamel.yaml>0.15.0,<0.17.0', + 'ruamel.yaml>0.15.0,<0.18.0', 'setuptools', 'colorama>=0.4.1,<0.5', ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/test_requirements.txt new/borgmatic-1.5.13/test_requirements.txt --- old/borgmatic-1.5.12/test_requirements.txt 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/test_requirements.txt 2021-03-31 00:53:19.000000000 +0200 @@ -1,25 +1,28 @@ -appdirs==1.4.3 -atomicwrites==1.3.0 -attrs==19.3.0 -black==19.3b0; python_version >= '3.6' -click==7.0 -colorama==0.4.1 -coverage==4.5.4 +appdirs==1.4.4; python_version >= '3.8' +atomicwrites==1.4.0 +attrs==20.3.0; python_version >= '3.8' +black==19.10b0; python_version >= '3.8' +click==7.1.2; python_version >= '3.8' +colorama==0.4.4 +coverage==5.3 docopt==0.6.2 -flake8==3.7.9 +flake8==3.8.4 flexmock==0.10.4 -isort==4.3.21 +isort==5.6.4 mccabe==0.6.1 -more-itertools==7.2.0 -pluggy==0.13.0 -py==1.8.0 -pycodestyle==2.5.0 -pyflakes==2.1.1 +more-itertools==8.6.0 +pluggy==0.13.1 +pathspec==0.8.1; python_version >= '3.8' +py==1.9.0 +pycodestyle==2.6.0 +pyflakes==2.2.0 pykwalify==1.7.0 -pytest==5.2.2 -pytest-cov==2.8.1 -python-dateutil==2.8.0 -PyYAML==5.1.2 -requests==2.22.0 -ruamel.yaml>0.15.0,<0.17.0 -toml==0.10.0 +pytest==6.1.2 +pytest-cov==2.10.1 +python-dateutil==2.8.1 +PyYAML==5.3.1 +regex; python_version >= '3.8' +requests==2.25.0 +ruamel.yaml>0.15.0,<0.18.0 +toml==0.10.2; python_version >= '3.8' +typed-ast==1.4.2; python_version >= '3.8' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/tests/end-to-end/docker-compose.yaml new/borgmatic-1.5.13/tests/end-to-end/docker-compose.yaml --- old/borgmatic-1.5.12/tests/end-to-end/docker-compose.yaml 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/tests/end-to-end/docker-compose.yaml 2021-03-31 00:53:19.000000000 +0200 @@ -1,7 +1,7 @@ version: '3' services: postgresql: - image: postgres:12.2-alpine + image: postgres:13.1-alpine environment: POSTGRES_PASSWORD: test POSTGRES_DB: test @@ -11,7 +11,7 @@ MYSQL_ROOT_PASSWORD: test MYSQL_DATABASE: test tests: - image: python:3.8-alpine3.11 + image: alpine:edge volumes: - "../..:/app:ro" tmpfs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/tests/integration/test_execute.py new/borgmatic-1.5.13/tests/integration/test_execute.py --- old/borgmatic-1.5.12/tests/integration/test_execute.py 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/tests/integration/test_execute.py 2021-03-31 00:53:19.000000000 +0200 @@ -88,13 +88,21 @@ def test_log_outputs_kills_other_processes_when_one_errors(): flexmock(module.logger).should_receive('log') - flexmock(module).should_receive('exit_code_indicates_error').and_return(True) flexmock(module).should_receive('command_for_process').and_return('grep') process = subprocess.Popen(['grep'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + flexmock(module).should_receive('exit_code_indicates_error').with_args( + process, None, 'borg' + ).and_return(False) + flexmock(module).should_receive('exit_code_indicates_error').with_args( + process, 2, 'borg' + ).and_return(True) other_process = subprocess.Popen( ['watch', 'true'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) + flexmock(module).should_receive('exit_code_indicates_error').with_args( + other_process, None, 'borg' + ).and_return(False) flexmock(module).should_receive('output_buffer_for_process').with_args(process, ()).and_return( process.stdout ) @@ -118,10 +126,15 @@ def test_log_outputs_truncates_long_error_output(): flexmock(module).ERROR_OUTPUT_MAX_LINE_COUNT = 0 flexmock(module.logger).should_receive('log') - flexmock(module).should_receive('exit_code_indicates_error').and_return(True) flexmock(module).should_receive('command_for_process').and_return('grep') process = subprocess.Popen(['grep'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + flexmock(module).should_receive('exit_code_indicates_error').with_args( + process, None, 'borg' + ).and_return(False) + flexmock(module).should_receive('exit_code_indicates_error').with_args( + process, 2, 'borg' + ).and_return(True) flexmock(module).should_receive('output_buffer_for_process').and_return(process.stdout) with pytest.raises(subprocess.CalledProcessError) as error: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/tests/unit/commands/test_borgmatic.py new/borgmatic-1.5.13/tests/unit/commands/test_borgmatic.py --- old/borgmatic-1.5.12/tests/unit/commands/test_borgmatic.py 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/tests/unit/commands/test_borgmatic.py 2021-03-31 00:53:19.000000000 +0200 @@ -447,7 +447,9 @@ flexmock(module).should_receive('run_configuration').and_return(['foo', 'bar']).and_return( ['baz'] ) - flexmock(module.sys.stdout).should_receive('write').with_args('["foo", "bar", "baz"]').once() + stdout = flexmock() + stdout.should_receive('write').with_args('["foo", "bar", "baz"]').once() + flexmock(module.sys).stdout = stdout arguments = {} tuple( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/tests/unit/hooks/test_healthchecks.py new/borgmatic-1.5.13/tests/unit/hooks/test_healthchecks.py --- old/borgmatic-1.5.12/tests/unit/hooks/test_healthchecks.py 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/tests/unit/hooks/test_healthchecks.py 2021-03-31 00:53:19.000000000 +0200 @@ -28,7 +28,9 @@ def test_format_buffered_logs_for_payload_flattens_log_buffer(): handler = module.Forgetful_buffering_handler(byte_capacity=100, log_level=1) handler.buffer = ['foo\n', 'bar\n'] - flexmock(module.logging).should_receive('getLogger').and_return(flexmock(handlers=[handler])) + logger = flexmock(handlers=[handler]) + logger.should_receive('removeHandler') + flexmock(module.logging).should_receive('getLogger').and_return(logger) payload = module.format_buffered_logs_for_payload() @@ -39,7 +41,9 @@ handler = module.Forgetful_buffering_handler(byte_capacity=100, log_level=1) handler.buffer = ['foo\n', 'bar\n'] handler.forgot = True - flexmock(module.logging).should_receive('getLogger').and_return(flexmock(handlers=[handler])) + logger = flexmock(handlers=[handler]) + logger.should_receive('removeHandler') + flexmock(module.logging).should_receive('getLogger').and_return(logger) payload = module.format_buffered_logs_for_payload() @@ -47,9 +51,9 @@ def test_format_buffered_logs_for_payload_without_handler_produces_empty_payload(): - flexmock(module.logging).should_receive('getLogger').and_return( - flexmock(handlers=[module.logging.Handler()]) - ) + logger = flexmock(handlers=[module.logging.Handler()]) + logger.should_receive('removeHandler') + flexmock(module.logging).should_receive('getLogger').and_return(logger) payload = module.format_buffered_logs_for_payload() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/borgmatic-1.5.12/tox.ini new/borgmatic-1.5.13/tox.ini --- old/borgmatic-1.5.12/tox.ini 2020-11-21 22:56:19.000000000 +0100 +++ new/borgmatic-1.5.13/tox.ini 2021-03-31 00:53:19.000000000 +0200 @@ -1,5 +1,5 @@ [tox] -envlist = py35,py36,py37,py38 +envlist = py36,py37,py38,py39 skip_missing_interpreters = True skipsdist = True minversion = 3.14.1 @@ -13,8 +13,8 @@ passenv = COVERAGE_FILE commands = pytest {posargs} - py36,py37,py38: black --check . - isort --recursive --check-only --settings-path setup.cfg . + py38,py39: black --check . + isort --check-only --settings-path setup.cfg . flake8 borgmatic tests [testenv:black] @@ -34,4 +34,4 @@ [testenv:isort] deps = {[testenv]deps} commands = - isort {posargs:--recursive} --settings-path setup.cfg . + isort --settings-path setup.cfg . ++++++ skip-tests.patch ++++++ --- /var/tmp/diff_new_pack.dFpQOP/_old 2021-04-01 14:19:04.452136886 +0200 +++ /var/tmp/diff_new_pack.dFpQOP/_new 2021-04-01 14:19:04.456136893 +0200 @@ -1,5 +1,5 @@ ---- borgmatic-1.5.5/tests/integration/test_execute.py.orig 2020-05-27 11:20:25.836727176 +0200 -+++ borgmatic-1.5.5/tests/integration/test_execute.py 2020-05-27 11:22:21.244991670 +0200 +--- a/tests/integration/test_execute.py.orig 2021-03-31 12:12:42.743855551 +0200 ++++ b/tests/integration/test_execute.py 2021-03-31 12:13:45.048295215 +0200 @@ -86,6 +86,7 @@ assert not error.value.output @@ -7,8 +7,8 @@ +@pytest.mark.skip(reason="test is failing in our env") def test_log_outputs_kills_other_processes_when_one_errors(): flexmock(module.logger).should_receive('log') - flexmock(module).should_receive('exit_code_indicates_error').and_return(True) -@@ -115,6 +116,7 @@ + flexmock(module).should_receive('command_for_process').and_return('grep') +@@ -123,6 +124,7 @@ assert error.value.output
