From 8ed5467435f320cb020e8294f259ececbcfcc5c9 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sun, 2 Jan 2022 23:17:57 -0800 Subject: [PATCH 1/3] Drop support for Python 3.6. Add support for 3.10. --- .drone.yml | 51 ------------------------------------------- NEWS | 2 ++ test_requirements.txt | 6 ++--- tox.ini | 2 +- 4 files changed, 6 insertions(+), 55 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0d4e4601..c4278dec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,54 +1,3 @@ ---- -kind: pipeline -name: python-3-6-alpine-3-9 - -services: - - name: postgresql - image: postgres:11.9-alpine - environment: - POSTGRES_PASSWORD: test - POSTGRES_DB: test - - name: mysql - image: mariadb:10.3 - environment: - MYSQL_ROOT_PASSWORD: test - MYSQL_DATABASE: test - -clone: - skip_verify: true - -steps: -- name: build - image: alpine:3.9 - pull: always - commands: - - scripts/run-full-tests ---- -kind: pipeline -name: python-3-7-alpine-3-10 - -services: - - name: postgresql - image: postgres:11.9-alpine - environment: - POSTGRES_PASSWORD: test - POSTGRES_DB: test - - name: mysql - image: mariadb:10.3 - environment: - MYSQL_ROOT_PASSWORD: test - MYSQL_DATABASE: test - -clone: - skip_verify: true - -steps: -- name: build - image: alpine:3.10 - pull: always - commands: - - scripts/run-full-tests ---- kind: pipeline name: python-3-8-alpine-3-13 diff --git a/NEWS b/NEWS index 350af32e..f4278c0b 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ * #471: When command-line configuration override produces a parse error, error cleanly instead of tracebacking. * #476: Fix unicode error when restoring particular MySQL databases. + * Drop support for Python 3.6, which has been end-of-lifed. + * Add support for Python 3.10. 1.5.21 * #28: Optionally retry failing backups via "retries" and "retry_wait" configuration options. diff --git a/test_requirements.txt b/test_requirements.txt index 56482a7c..4b5d6275 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -14,10 +14,10 @@ py==1.10.0 pycodestyle==2.6.0 pyflakes==2.2.0 jsonschema==3.2.0 -pytest==6.1.2 -pytest-cov==2.10.1 +pytest==6.2.5 +pytest-cov==3.0.0 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' +typed-ast==1.5.1; python_version >= '3.8' diff --git a/tox.ini b/tox.ini index 12a0f603..7d8340c6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,py37,py38,py39 +envlist = py37,py38,py39,py310 skip_missing_interpreters = True skipsdist = True minversion = 3.14.1 From 96384d5ee119cbb3293f9bb03ece18e88a286c07 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sun, 2 Jan 2022 23:22:24 -0800 Subject: [PATCH 2/3] Attempt to fix typed-ast build issue by relaxing version requirements in test. --- test_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_requirements.txt b/test_requirements.txt index 4b5d6275..6513bcaa 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -20,4 +20,4 @@ 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.5.1; python_version >= '3.8' +typed-ast; python_version >= '3.8' From 3ec3d8d0459accc8a2ee1900efd5029d3b247772 Mon Sep 17 00:00:00 2001 From: Ian Kerins Date: Mon, 3 Jan 2022 02:29:38 -0500 Subject: [PATCH 3/3] Remove references to Lima Labs From their homepage: > Lima Labs is shutting down our storage business. We will try to keep data available as long as possible. No promises but we are targeting 3/1/2022 to bring down Archive and Canada. --- README.md | 2 -- docs/how-to/make-backups-redundant.md | 4 +--- docs/how-to/set-up-backups.md | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 8fb2a107..9a37cfc2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ location: repositories: - 1234@usw-s001.rsync.net:backups.borg - k8pDxu32@k8pDxu32.repo.borgbase.com:repo - - user1@scp2.cdn.lima-labs.com:repo - /var/lib/backups/local.borg retention: @@ -93,7 +92,6 @@ referral links, but without any tracking scripts or cookies.)
  • BorgBase: Borg hosting service with support for monitoring, 2FA, and append-only repos
    • -
  • Lima-Labs: Affordable, reliable cloud data storage accessable via SSH/SCP/FTP for Borg backups or any other bulk storage needs
Additionally, [rsync.net](https://www.rsync.net/products/borg.html) and diff --git a/docs/how-to/make-backups-redundant.md b/docs/how-to/make-backups-redundant.md index 1ef81873..8d643cfa 100644 --- a/docs/how-to/make-backups-redundant.md +++ b/docs/how-to/make-backups-redundant.md @@ -22,7 +22,6 @@ location: repositories: - 1234@usw-s001.rsync.net:backups.borg - k8pDxu32@k8pDxu32.repo.borgbase.com:repo - - user1@scp2.cdn.lima-labs.com:repo - /var/lib/backups/local.borg ``` @@ -35,8 +34,7 @@ Here's a way of visualizing what borgmatic does with the above configuration: 1. Backup `/home` and `/etc` to `1234@usw-s001.rsync.net:backups.borg` 2. Backup `/home` and `/etc` to `k8pDxu32@k8pDxu32.repo.borgbase.com:repo` -3. Backup `/home` and `/etc` to `user1@scp2.cdn.lima-labs.com:repo` -4. Backup `/home` and `/etc` to `/var/lib/backups/local.borg` +3. Backup `/home` and `/etc` to `/var/lib/backups/local.borg` This gives you redundancy of your data across repositories and even potentially across providers. diff --git a/docs/how-to/set-up-backups.md b/docs/how-to/set-up-backups.md index e10b5b3e..09576419 100644 --- a/docs/how-to/set-up-backups.md +++ b/docs/how-to/set-up-backups.md @@ -101,7 +101,6 @@ referral links, but without any tracking scripts or cookies.)
  • BorgBase: Borg hosting service with support for monitoring, 2FA, and append-only repos
    • -
  • Lima-Labs: Affordable, reliable cloud data storage accessable via SSH/SCP/FTP for Borg backups or any other bulk storage needs
Additionally, [rsync.net](https://www.rsync.net/products/borg.html) and