Page MenuHomeSoftware Heritage
Differential D8072

Use separate base classes for intrinsic and extrinsic mappings
ClosedPublic
Actions

Authored by vlorentz on Jul 4 2022, 1:38 PM.

Details

Reviewers
douardda
Group Reviewers
Reviewers
Commits
rDCIDXd41f26eef056: Use separate base classes for intrinsic and extrinsic mappings
Summary

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

Partially addresses comments in D8053

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

vlorentz created this revision.Jul 4 2022, 1:38 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptJul 4 2022, 1:38 PM
vlorentz updated this revision to Diff 29136.Jul 4 2022, 1:41 PM

update docs

swh-public-ci added a comment.Jul 4 2022, 1:44 PM

Build has FAILED

Patch application report for D8072 (id=29135)

Could not rebase; Attempt merge onto 61b22345e7...

Updating 61b2234..8340183
Fast-forward
 swh/indexer/metadata.py                     | 10 +++--
 swh/indexer/metadata_detector.py            |  4 +-
 swh/indexer/metadata_dictionary/__init__.py | 12 +++++-
 swh/indexer/metadata_dictionary/base.py     | 59 +++++++++++++++++------------
 swh/indexer/metadata_dictionary/cff.py      | 10 ++---
 swh/indexer/metadata_dictionary/codemeta.py |  4 +-
 swh/indexer/metadata_dictionary/github.py   |  4 +-
 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     |  4 +-
 11 files changed, 69 insertions(+), 50 deletions(-)
Changes applied before test
commit 8340183b9574a40f540b0fa18013b9daf0fb54b6
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

commit d84d1a47c3fbfe6eff2afd26253382f9f3fd13e5
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:03:17 2022 +0200

    cff: Remove redundant @context setting
    
    It is already set by _translate_dict itself.

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

Harbormaster failed remote builds in B30228: Diff 29135!Jul 4 2022, 1:44 PM
swh-public-ci added a comment.Jul 4 2022, 1:47 PM

Build has FAILED

Patch application report for D8072 (id=29136)

Could not rebase; Attempt merge onto 61b22345e7...

Updating 61b2234..5fb5092
Fast-forward
 docs/metadata-workflow.rst                  |  6 ++-
 swh/indexer/metadata.py                     | 10 +++--
 swh/indexer/metadata_detector.py            |  4 +-
 swh/indexer/metadata_dictionary/__init__.py | 12 +++++-
 swh/indexer/metadata_dictionary/base.py     | 59 +++++++++++++++++------------
 swh/indexer/metadata_dictionary/cff.py      | 10 ++---
 swh/indexer/metadata_dictionary/codemeta.py |  4 +-
 swh/indexer/metadata_dictionary/github.py   |  4 +-
 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     |  4 +-
 12 files changed, 73 insertions(+), 52 deletions(-)
Changes applied before test
commit 5fb5092657ba4c3dd51c079eaba397f52f4f5f9d
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

commit d84d1a47c3fbfe6eff2afd26253382f9f3fd13e5
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:03:17 2022 +0200

    cff: Remove redundant @context setting
    
    It is already set by _translate_dict itself.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 4 2022, 1:47 PM
Harbormaster failed remote builds in B30229: Diff 29136!
vlorentz added a child revision: D8073: Use compact URIs for ForgeFed and ActivityStreams.Jul 4 2022, 1:56 PM
vlorentz updated this revision to Diff 29139.Jul 4 2022, 2:04 PM

fix doc syntax

swh-public-ci added a comment.Jul 4 2022, 2:10 PM

Build is green

Patch application report for D8072 (id=29139)

Could not rebase; Attempt merge onto 61b22345e7...

Updating 61b2234..7a2d641
Fast-forward
 docs/metadata-workflow.rst                  |  6 ++-
 swh/indexer/metadata.py                     | 10 +++--
 swh/indexer/metadata_detector.py            |  4 +-
 swh/indexer/metadata_dictionary/__init__.py | 12 +++++-
 swh/indexer/metadata_dictionary/base.py     | 59 +++++++++++++++++------------
 swh/indexer/metadata_dictionary/cff.py      | 10 ++---
 swh/indexer/metadata_dictionary/codemeta.py |  4 +-
 swh/indexer/metadata_dictionary/github.py   |  4 +-
 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     |  4 +-
 12 files changed, 73 insertions(+), 52 deletions(-)
Changes applied before test
commit 7a2d641f4fdd2f9922800e4f12c99646cf86cb6f
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

commit d84d1a47c3fbfe6eff2afd26253382f9f3fd13e5
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:03:17 2022 +0200

    cff: Remove redundant @context setting
    
    It is already set by _translate_dict itself.

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

Harbormaster completed remote builds in B30231: Diff 29139.Jul 4 2022, 2:10 PM
vlorentz requested review of this revision.Jul 4 2022, 2:10 PM
vlorentz updated this revision to Diff 29169.Jul 5 2022, 3:27 PM

rebase

swh-public-ci added a comment.Jul 5 2022, 3:33 PM

Build is green

Patch application report for D8072 (id=29169)

Could not rebase; Attempt merge onto ff2730c3f6...

Updating ff2730c..7dfc75c
Fast-forward
 docs/metadata-workflow.rst                  |  6 ++-
 swh/indexer/metadata.py                     | 10 +++--
 swh/indexer/metadata_detector.py            |  4 +-
 swh/indexer/metadata_dictionary/__init__.py | 12 +++++-
 swh/indexer/metadata_dictionary/base.py     | 59 +++++++++++++++++------------
 swh/indexer/metadata_dictionary/cff.py      | 10 ++---
 swh/indexer/metadata_dictionary/codemeta.py |  4 +-
 swh/indexer/metadata_dictionary/composer.py |  4 +-
 swh/indexer/metadata_dictionary/github.py   |  4 +-
 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     |  4 +-
 13 files changed, 75 insertions(+), 54 deletions(-)
Changes applied before test
commit 7dfc75cf1af32c0c7dc066434287ecb65091dc5c
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

commit c2742b5b75f62a550ee905699cd47b5b13eac52a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:03:17 2022 +0200

    cff: Remove redundant @context setting
    
    It is already set by _translate_dict itself.

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

Harbormaster completed remote builds in B30259: Diff 29169.Jul 5 2022, 3:33 PM
vlorentz updated this revision to Diff 29171.Jul 5 2022, 3:51 PM

remove dead code

swh-public-ci added a comment.Jul 5 2022, 3:57 PM

Build is green

Patch application report for D8072 (id=29171)

Could not rebase; Attempt merge onto ff2730c3f6...

Updating ff2730c..d41f26e
Fast-forward
 docs/metadata-workflow.rst                  |  6 ++-
 swh/indexer/metadata.py                     | 10 +++--
 swh/indexer/metadata_detector.py            |  4 +-
 swh/indexer/metadata_dictionary/__init__.py | 12 +++++-
 swh/indexer/metadata_dictionary/base.py     | 59 +++++++++++++++++------------
 swh/indexer/metadata_dictionary/cff.py      | 10 ++---
 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 ++----
 13 files changed, 78 insertions(+), 66 deletions(-)
Changes applied before test
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

commit c2742b5b75f62a550ee905699cd47b5b13eac52a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Jul 4 13:03:17 2022 +0200

    cff: Remove redundant @context setting
    
    It is already set by _translate_dict itself.

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

Harbormaster completed remote builds in B30261: Diff 29171.Jul 5 2022, 3:57 PM
douardda accepted this revision.Jul 6 2022, 3:58 PM
This revision is now accepted and ready to land.Jul 6 2022, 3:58 PM
vlorentz added a child revision: D8082: Document codemeta.make_absolute_uri().Jul 6 2022, 4:05 PM
Closed by commit rDCIDXd41f26eef056: Use separate base classes for intrinsic and extrinsic mappings (authored by vlorentz). · Explain WhyJul 11 2022, 5:21 PM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDCIDXd41f26eef056: Use separate base classes for intrinsic and extrinsic mappings.

Revision Contents
Changeset List

PathSize
docs/
6 lines
swh/
indexer/
10 lines
4 lines
metadata_dictionary/
12 lines
59 lines
4 lines
4 lines
4 lines
12 lines
4 lines
4 lines
4 lines
11 lines

Diff 29283

View Options

docs/metadata-workflow.rst

Loading...
View Options

swh/indexer/metadata.py

Loading...
View Options

swh/indexer/metadata_detector.py

Loading...
View Options

swh/indexer/metadata_dictionary/__init__.py

Loading...
View Options

swh/indexer/metadata_dictionary/base.py

Loading...
View Options

swh/indexer/metadata_dictionary/cff.py

Loading...
View Options

swh/indexer/metadata_dictionary/codemeta.py

Loading...
View Options

swh/indexer/metadata_dictionary/composer.py

Loading...
View Options

swh/indexer/metadata_dictionary/github.py

Loading...
View Options

swh/indexer/metadata_dictionary/maven.py

Loading...
View Options

swh/indexer/metadata_dictionary/npm.py

Loading...
View Options

swh/indexer/metadata_dictionary/python.py

Loading...
View Options

swh/indexer/metadata_dictionary/ruby.py

Loading...
About · Developer information · Legal