Skip to content

Commit

Permalink
build(deps): bump duplicity from 1.2.3 to 2.1.1
Browse files Browse the repository at this point in the history
Bumps [duplicity](https://github.com/librsync/librsync) from 1.2.3 to 2.1.1.
- [Release notes](https://github.com/librsync/librsync/releases)
- [Changelog](https://github.com/librsync/librsync/blob/master/NEWS.md)
- [Commits](https://github.com/librsync/librsync/commits)

---
updated-dependencies:
- dependency-name: duplicity
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and josep-tecnativa committed Oct 6, 2023
1 parent fd666c1 commit af232e8
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 31 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim AS builder
FROM python:3.10-slim AS builder

WORKDIR /app
ADD pyproject.toml poetry.lock ./
Expand All @@ -8,7 +8,7 @@ RUN pip install --no-cache-dir poetry
# Test comment
RUN poetry export --extras duplicity --output /app/requirements.txt

FROM python:3.11-alpine AS base
FROM python:3.10-alpine AS base

ENV CRONTAB_15MIN='*/15 * * * *' \
CRONTAB_HOURLY='0 * * * *' \
Expand Down Expand Up @@ -86,7 +86,7 @@ RUN chmod a+rx /usr/local/bin/* && sync
FROM base AS s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM base AS docker
Expand All @@ -96,7 +96,7 @@ RUN apk add --no-cache docker-cli
FROM docker AS docker-s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM base AS postgres
Expand Down Expand Up @@ -139,10 +139,10 @@ ENV JOB_200_WHEN='daily weekly' \
FROM postgres AS postgres-s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM postgres-s3 AS postgres-multi
ENV DST='multi' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)-' \
OPTIONS_EXTRA_S3='--s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA_S3='--s3-multipart-chunk-size 10'
58 changes: 43 additions & 15 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PyDrive = {version = "^1.3.1", optional = true}
PyDrive2 = {version = "^1.17.0", optional = true}
python-swiftclient = {version = "^4.3.0", optional = true}
requests-oauthlib = {version = "^1.3.1", optional = true}
duplicity = {version = "^1.2.3", optional = true}
duplicity = {version = "^2.1.1", optional = true}
dropbox = {version = "^11.36.2", optional = true}
python-keystoneclient = {version = "^5.2.0", optional = true}
idna = {version = "3.4", optional = true}
Expand Down
18 changes: 9 additions & 9 deletions tests/test_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def test_postgres_db_filters(
"--env=PGPASSWORD=password",
"--env=PASSPHRASE=good",
f"--env=PGHOST={postgres_container['NetworkSettings']['IPAddress']}",
"--env=DST=file:///mnt/backup/dst",
"--env=DST=file://mnt/backup/dst",
]
if dbs_to_include is not None:
exc = exc[f"--env=DBS_TO_INCLUDE={dbs_to_include}"]
Expand All @@ -110,7 +110,7 @@ def test_postgres_db_filters(
# Fri Oct 29 12:29:34 2021 .
# Fri Oct 29 12:29:34 2021 demo1.sql
# Fri Oct 29 12:29:34 2021 demo2.sql
output = exc("dup", "list-current-files", "file:///mnt/backup/dst")
output = exc("dup", "list-current-files", "file://mnt/backup/dst")
# Assert we backed up the correct DBs
backed = re.findall(r" (\w+)\.sql", output)
assert backed == dbs_matched
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_postgres_restore(
"--env=PASSPHRASE=good",
f"--env=PGHOST={postgres_container['NetworkSettings']['IPAddress']}",
"--env=SRC=/mnt/backup/src",
"--env=DST=file:///mnt/backup/dst",
"--env=DST=file://mnt/backup/dst",
]
exc = exc[duplicity_container]
# Create all those test dbs
Expand All @@ -162,21 +162,21 @@ def test_postgres_restore(
@pytest.mark.parametrize(
"dbs_to_include, dbs_to_exclude, dbs_matched, dests",
(
(None, "^demo", ["prod1", "prod2"], ["file:///mnt/backup/dst_1"]),
(None, "^demo", ["prod1", "prod2"], ["file://mnt/backup/dst_1"]),
(
"^prod",
None,
["prod1", "prod2"],
["file:///mnt/backup/dst_1", "file:///mnt/backup/dst_2"],
["file://mnt/backup/dst_1", "file://mnt/backup/dst_2"],
),
(
"prod",
"2",
["prod1"],
[
"file:///mnt/backup/dst_1",
"file:///mnt/backup/dst_2",
"file:///mnt/backup/dst_3",
"file://mnt/backup/dst_1",
"file://mnt/backup/dst_2",
"file://mnt/backup/dst_3",
],
),
),
Expand Down Expand Up @@ -232,7 +232,7 @@ def test_postgres_multi(
(
(
["prod1"],
["file:///mnt/backup/dst_1", "file:///mnt/backup/dst_2"],
["file://mnt/backup/dst_1", "file://mnt/backup/dst_2"],
),
),
)
Expand Down

0 comments on commit af232e8

Please sign in to comment.