Differential D3979

Fix blackified strings with spurious concatenation and use f-strings
ClosedPublic
Actions

Authored by ardumont on Sep 17 2020, 5:12 PM.

Details

Reviewers

anlambert

Group Reviewers

Reviewers

Commits

rDDEP9d64e2f8c13f: Fix blackified strings with spurrious concatenation and use f-strings

Test Plan

tox

Diff Detail

Repository

rDDEP Push deposit

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.Sep 17 2020, 5:12 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptSep 17 2020, 5:12 PM

Build is green

Patch application report for D3979 (id=14018)

Could not rebase; Attempt merge onto 0f82840937...

Merge made by the 'recursive' strategy.
 requirements-server.txt                            |  1 +
 swh/deposit/api/__init__.py                        | 11 +++++++
 swh/deposit/api/common.py                          | 38 ++++++++++------------
 swh/deposit/api/private/deposit_read.py            |  8 ++++-
 swh/deposit/cli/client.py                          |  2 +-
 .../api/test_deposit_private_read_metadata.py      | 25 +++++++-------
 6 files changed, 51 insertions(+), 34 deletions(-)

Changes applied before test

commit e4fefea0878712e4c4b0cbd2158d1b20a6460783
Merge: 0f828409 387feeb6
Author: Jenkins user <jenkins@localhost>
Date:   Thu Sep 17 15:12:49 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 387feeb6e2b0a641b0590e7095a3525685492ee7
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Sep 17 17:12:41 2020 +0200

    Fix blackified strings with spurrious concatenation and use f-strings

commit 7675c74e3fdfaf17d31dd04eeaf21c56eb3eff4d
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Sep 17 12:36:48 2020 +0200

    Declare deposit tool with the correct version
    
    This will allow deposit loader to reference metadata with their correct deposit
    version.

See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/94/ for more details.

Harbormaster completed remote builds in B15245: Diff 14018.Sep 17 2020, 5:15 PM

anlambert accepted this revision.Sep 17 2020, 5:16 PM

This revision is now accepted and ready to land.Sep 17 2020, 5:16 PM

Rebase

Build is green

Patch application report for D3979 (id=14021)

Could not rebase; Attempt merge onto a12b1195b0...

Updating a12b1195..9d64e2f8
Fast-forward
 requirements-server.txt                            |  1 +
 swh/deposit/api/__init__.py                        | 11 +++++++
 swh/deposit/api/common.py                          | 38 ++++++++++------------
 swh/deposit/api/private/deposit_read.py            |  7 +++-
 swh/deposit/cli/client.py                          |  2 +-
 .../api/test_deposit_private_read_metadata.py      | 25 +++++++-------
 swh/deposit/tests/test_init.py                     | 10 ++++++
 7 files changed, 60 insertions(+), 34 deletions(-)
 create mode 100644 swh/deposit/tests/test_init.py

Changes applied before test

commit 9d64e2f8c13fb3eaa7e1ae5a50922336b377aa46
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Sep 17 17:12:41 2020 +0200

    Fix blackified strings with spurrious concatenation and use f-strings

commit 014f34278f582b6f43dd8e809b034637de06c824
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu Sep 17 12:36:48 2020 +0200

    Declare deposit tool with the correct version
    
    This will allow deposit loader to reference metadata with their correct deposit
    version.

See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/96/ for more details.

Harbormaster completed remote builds in B15277: Diff 14021.Sep 17 2020, 6:08 PM

Closed by commit rDDEP9d64e2f8c13f: Fix blackified strings with spurrious concatenation and use f-strings (authored by ardumont). · Explain WhySep 17 2020, 6:11 PM

This revision was automatically updated to reflect the committed changes.

ardumont added a commit: rDDEP9d64e2f8c13f: Fix blackified strings with spurrious concatenation and use f-strings.

zack retitled this revision from Fix blackified strings with spurrious concatenation and use f-strings to Fix blackified strings with spurious concatenation and use f-strings.Sep 17 2020, 7:39 PM