Page MenuHomeSoftware Heritage

Add base XmlMapping to deduplicate between MavenMapping and NugetMapping
ClosedPublic

Authored by vlorentz on Aug 22 2022, 2:27 PM.

Diff Detail

Event Timeline

Build is green

Patch application report for D8278 (id=29892)

Could not rebase; Attempt merge onto 7d7f29fb6a...

Updating 7d7f29f..d5207e9
Fast-forward
 swh/indexer/codemeta.py                            | 23 ++++----
 swh/indexer/metadata_dictionary/base.py            | 64 +++++++++++++++++-----
 swh/indexer/metadata_dictionary/cff.py             | 17 +++---
 swh/indexer/metadata_dictionary/composer.py        |  9 +--
 swh/indexer/metadata_dictionary/dart.py            | 13 +++--
 swh/indexer/metadata_dictionary/github.py          | 34 +++++-------
 swh/indexer/metadata_dictionary/maven.py           | 53 +++++++-----------
 swh/indexer/metadata_dictionary/npm.py             | 11 ++--
 swh/indexer/metadata_dictionary/nuget.py           | 27 +++------
 swh/indexer/metadata_dictionary/python.py          | 22 ++++----
 swh/indexer/metadata_dictionary/ruby.py            |  7 ++-
 swh/indexer/namespaces.py                          | 28 ++++++++++
 .../tests/metadata_dictionary/test_nuget.py        | 12 ++--
 13 files changed, 180 insertions(+), 140 deletions(-)
 create mode 100644 swh/indexer/namespaces.py
Changes applied before test
commit d5207e9521d982d2c170399b4855de3b6d9e8005
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:20:14 2022 +0200

    Add base XmlMapping to deduplicate between MavenMapping and NugetMapping

commit c4cd68f6ae0ea92be6e312a37fcf0fe597e7616f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:18:39 2022 +0200

    nuget: Remove test-specific code from the main class

commit b09e2bcfc73d72a670dbedfe5f8334d0036ce195
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Aug 22 13:14:05 2022 +0200

    nuget: Inherit directly from BaseIntrinsicMapping

commit c8a4571c8763c84c064e832f598e949407e0e429
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:18:30 2022 +0200

    Replace 'normalize' parameter of _translate_dict() with a hook method
    
    This parameter was only used to execute extra code before
    `normalize_translation` is called. This caused some duplication, and
    will not work when switching to a non-JSON-LD internal representation.
    
    Removing it also makes the code of mappings more consistent, by removing
    specific field handling from their implementation of the `translate`
    method itself.

commit 466108c1667c88be7ff272e565ffe076e16064d8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 12:13:33 2022 +0200

    python: Simplify translation logic of author metadata

commit 92b53419f6f9d699451609cb23a946978ecb6b07
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 19 11:37:06 2022 +0200

    metadata_dictionary: Simplify code using rdflib-style namespace classes

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

ardumont added a subscriber: ardumont.

Missing a couple of failure test cases and some docstring suggestion change inline.

Otherwise, lgtm.

swh/indexer/metadata_dictionary/base.py
263

you typed it already.

266–267
This revision is now accepted and ready to land.Aug 23 2022, 9:59 AM

hmm yes, I just copy-pasted from JsonMapping. Fixed by D8284.

Missing a couple of failure test cases

T4445