Page MenuHomeSoftware Heritage

Simplify codemeta.make_absolute_uri()
ClosedPublic

Authored by vlorentz on Jul 6 2022, 4:05 PM.

Details

Summary

Depends on D8082.

Diff Detail

Repository
rDCIDX Metadata indexer
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D8083 (id=29186)

Could not rebase; Attempt merge onto c2742b5b75...

Updating c2742b5..e177c77
Fast-forward
 docs/metadata-workflow.rst                         |  6 ++-
 swh/indexer/codemeta.py                            | 57 ++++++++++++--------
 swh/indexer/metadata.py                            | 10 ++--
 swh/indexer/metadata_detector.py                   |  4 +-
 swh/indexer/metadata_dictionary/__init__.py        | 12 ++++-
 swh/indexer/metadata_dictionary/base.py            | 63 ++++++++++++++--------
 swh/indexer/metadata_dictionary/cff.py             |  4 +-
 swh/indexer/metadata_dictionary/codemeta.py        |  4 +-
 swh/indexer/metadata_dictionary/composer.py        |  4 +-
 swh/indexer/metadata_dictionary/github.py          | 12 ++---
 swh/indexer/metadata_dictionary/maven.py           |  4 +-
 swh/indexer/metadata_dictionary/npm.py             |  4 +-
 swh/indexer/metadata_dictionary/python.py          |  4 +-
 swh/indexer/metadata_dictionary/ruby.py            | 11 ++--
 .../tests/metadata_dictionary/test_github.py       | 16 ++++--
 15 files changed, 129 insertions(+), 86 deletions(-)
Changes applied before test
commit e177c77baf48b69e420a3eed6b9125a7f209947f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 18:26:24 2022 +0200

    Simplify codemeta.make_absolute_uri()

commit dd9adebeca15c697cc27011693c8d84f6ec1544e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 18:25:25 2022 +0200

    Document codemeta.make_absolute_uri()

commit 358ee08416dd847d7ebbddd0c721d7a287149175
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:55:19 2022 +0200

    Use compact URIs for ForgeFed and ActivityStreams
    
    It makes resulting documents (usually) shorter, and tests more readable.

commit d41f26eef0561fd41932eb688bc6908f2253ef4c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:37:58 2022 +0200

    Use separate base classes for intrinsic and extrinsic mappings
    
    detect_metadata_files and extrinsic_metadata_formats (respectively) are somewhat
    mutually exclusive, so it does not make much sense to have them in the same
    class and MAPPINGS dict

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

This revision is now accepted and ready to land.Jul 7 2022, 4:39 PM
This revision was automatically updated to reflect the committed changes.