Skip to content

Commit 36a2c5d

Browse files
dependabot[bot]josep-tecnativa
authored andcommitted
build(deps): bump duplicity from 1.2.3 to 2.1.1
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]>
1 parent f36d471 commit 36a2c5d

File tree

4 files changed

+57
-29
lines changed

4 files changed

+57
-29
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RUN chmod a+rx /usr/local/bin/* && sync
8585
FROM base AS s3
8686
ENV JOB_500_WHAT='dup full $SRC $DST' \
8787
JOB_500_WHEN='weekly' \
88-
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'
88+
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'
8989

9090

9191
FROM base AS docker
@@ -95,7 +95,7 @@ RUN apk add --no-cache docker-cli
9595
FROM docker AS docker-s3
9696
ENV JOB_500_WHAT='dup full $SRC $DST' \
9797
JOB_500_WHEN='weekly' \
98-
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'
98+
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'
9999

100100

101101
FROM base AS postgres
@@ -138,10 +138,10 @@ ENV JOB_200_WHEN='daily weekly' \
138138
FROM postgres AS postgres-s3
139139
ENV JOB_500_WHAT='dup full $SRC $DST' \
140140
JOB_500_WHEN='weekly' \
141-
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'
141+
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'
142142

143143

144144
FROM postgres-s3 AS postgres-multi
145145
ENV DST='multi' \
146146
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)-' \
147-
OPTIONS_EXTRA_S3='--s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
147+
OPTIONS_EXTRA_S3='--s3-multipart-chunk-size 10'

poetry.lock

Lines changed: 43 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PyDrive = {version = "^1.3.1", optional = true}
1818
PyDrive2 = {version = "^1.17.0", optional = true}
1919
python-swiftclient = {version = "^4.3.0", optional = true}
2020
requests-oauthlib = {version = "^1.3.1", optional = true}
21-
duplicity = {version = "^1.2.3", optional = true}
21+
duplicity = {version = "^2.1.1", optional = true}
2222
dropbox = {version = "^11.36.2", optional = true}
2323
python-keystoneclient = {version = "^5.2.0", optional = true}
2424
idna = {version = "3.4", optional = true}

tests/test_service.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_postgres_db_filters(
9393
"--env=PGPASSWORD=password",
9494
"--env=PASSPHRASE=good",
9595
f"--env=PGHOST={postgres_container['NetworkSettings']['IPAddress']}",
96-
"--env=DST=file:///mnt/backup/dst",
96+
"--env=DST=file://mnt/backup/dst",
9797
]
9898
if dbs_to_include is not None:
9999
exc = exc[f"--env=DBS_TO_INCLUDE={dbs_to_include}"]
@@ -110,7 +110,7 @@ def test_postgres_db_filters(
110110
# Fri Oct 29 12:29:34 2021 .
111111
# Fri Oct 29 12:29:34 2021 demo1.sql
112112
# Fri Oct 29 12:29:34 2021 demo2.sql
113-
output = exc("dup", "list-current-files", "file:///mnt/backup/dst")
113+
output = exc("dup", "list-current-files", "file://mnt/backup/dst")
114114
# Assert we backed up the correct DBs
115115
backed = re.findall(r" (\w+)\.sql", output)
116116
assert backed == dbs_matched
@@ -140,7 +140,7 @@ def test_postgres_restore(
140140
"--env=PASSPHRASE=good",
141141
f"--env=PGHOST={postgres_container['NetworkSettings']['IPAddress']}",
142142
"--env=SRC=/mnt/backup/src",
143-
"--env=DST=file:///mnt/backup/dst",
143+
"--env=DST=file://mnt/backup/dst",
144144
]
145145
exc = exc[duplicity_container]
146146
# Create all those test dbs
@@ -162,21 +162,21 @@ def test_postgres_restore(
162162
@pytest.mark.parametrize(
163163
"dbs_to_include, dbs_to_exclude, dbs_matched, dests",
164164
(
165-
(None, "^demo", ["prod1", "prod2"], ["file:///mnt/backup/dst_1"]),
165+
(None, "^demo", ["prod1", "prod2"], ["file://mnt/backup/dst_1"]),
166166
(
167167
"^prod",
168168
None,
169169
["prod1", "prod2"],
170-
["file:///mnt/backup/dst_1", "file:///mnt/backup/dst_2"],
170+
["file://mnt/backup/dst_1", "file://mnt/backup/dst_2"],
171171
),
172172
(
173173
"prod",
174174
"2",
175175
["prod1"],
176176
[
177-
"file:///mnt/backup/dst_1",
178-
"file:///mnt/backup/dst_2",
179-
"file:///mnt/backup/dst_3",
177+
"file://mnt/backup/dst_1",
178+
"file://mnt/backup/dst_2",
179+
"file://mnt/backup/dst_3",
180180
],
181181
),
182182
),
@@ -232,7 +232,7 @@ def test_postgres_multi(
232232
(
233233
(
234234
["prod1"],
235-
["file:///mnt/backup/dst_1", "file:///mnt/backup/dst_2"],
235+
["file://mnt/backup/dst_1", "file://mnt/backup/dst_2"],
236236
),
237237
),
238238
)

0 commit comments

Comments
 (0)