Merge made by the 'recursive' strategy.
 swh/deposit/api/private/deposit_read.py                     | 2 --
 swh/deposit/tests/api/test_deposit_private_read_metadata.py | 7 -------
 swh/deposit/tests/conftest.py                               | 3 +--
 3 files changed, 1 insertion(+), 11 deletions(-)

Changes applied before test

commit e6e19fc1e91264eb9fff8eabf0bab47118981d7c
Merge: 5a7d59cb 68eb441c
Author: Jenkins user <jenkins@localhost>
Date:   Wed Feb 23 12:44:26 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 68eb441cb90edbab5b1fadb1b411c106a6c9c70e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Feb 23 13:44:07 2022 +0100

    Remove metadata_dict from the API
    
    No one uses that, and it's redundant, as we provide the original XML

commit 189ba2f7cc9c5b35891b23adf19872b8f230b7e8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Feb 23 13:43:33 2022 +0100

    Remove unnecessary use of BytesIO

Link to build: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/740/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/740/console

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 23 2022, 1:52 PM

Harbormaster failed remote builds in B27077: Diff 26204!

vlorentz requested review of this revision.Feb 23 2022, 6:38 PM

No one uses that, and it's redundant, as we provide the original XML

It's not entirely true though, it's used in the loader [1].
We'll need a change in the loader-core to drop that entry as well.

[1] https://forge.softwareheritage.org/source/swh-loader-core/browse/master/swh/loader/package/deposit/loader.py$75

This revision is now accepted and ready to land.Feb 23 2022, 6:43 PM

Right, I missed it. The fix: D7234

rebase

Build has FAILED

Patch application report for D7230 (id=26221)

Could not rebase; Attempt merge onto 5a7d59cb2c...

Updating 5a7d59cb..5998e196
Fast-forward
 swh/deposit/api/private/deposit_read.py                     | 2 --
 swh/deposit/tests/api/test_deposit_private_read_metadata.py | 7 -------
 swh/deposit/tests/conftest.py                               | 3 +--
 3 files changed, 1 insertion(+), 11 deletions(-)

Changes applied before test

commit 5998e19648f4a987dc024935f20d7e0adae31dc8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Feb 23 13:44:07 2022 +0100

    Remove metadata_dict from the API
    
    No one uses that, and it's redundant, as we provide the original XML

commit 79be8e1c74e15607d4ced35fc2f2de1359c02ecb
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Feb 23 13:43:33 2022 +0100

    Remove unnecessary use of BytesIO

Link to build: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/749/
See console output for more information: https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/749/console

Harbormaster failed remote builds in B27094: Diff 26221!Feb 24 2022, 10:00 AM

This revision was landed with ongoing or failed builds.Feb 24 2022, 10:02 AM

Closed by commit rDDEP5998e19648f4: Remove metadata_dict from the API (authored by vlorentz). · Explain Why

This revision was automatically updated to reflect the committed changes.

vlorentz added a commit: rDDEP5998e19648f4: Remove metadata_dict from the API.

vlorentz added a task: T3971: swh.deposit.errors.ParserError: out of memory: line 1, column 0.Feb 24 2022, 10:05 AM