Skip to content
Snippets Groups Projects

Use compact URIs for ForgeFed and ActivityStreams

Closed Use compact URIs for ForgeFed and ActivityStreams
generated-differential-D8073-source into generated-differential-D8073-target
Closed vlorentz requested to merge generated-differential-D8073-source into generated-differential-D8073-target

It makes resulting documents (usually) shorter, and tests more readable.

Depends on !338 (closed) and !340 (closed)

Replaces !339 (closed).

Migrated from D8073 (view on Phabricator)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Software Heritage Continuous Integration for public repositories
    Software Heritage Continuous Integration for public repositories @swh-public-ci ·

    Build has FAILED

    Patch application report for D8073 (id=29137)

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

    Updating 61b2234..ae983c3
Fast-forward
 docs/metadata-workflow.rst                         |  6 ++-
 swh/indexer/codemeta.py                            | 23 +++++---
 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             | 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 +-
 .../tests/metadata_dictionary/test_github.py       | 16 ++++--
 14 files changed, 107 insertions(+), 61 deletions(-)
    Changes applied before test
    commit ae983c30869298af9d4b40434acec830c2de5fb0
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 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/323/ See console output for more information: https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/323/console

  • vlorentz
    vlorentz @vlorentz ·
    Author Maintainer

    rebase

  • Software Heritage Continuous Integration for public repositories
    Software Heritage Continuous Integration for public repositories @swh-public-ci ·

    Build is green

    Patch application report for D8073 (id=29140)

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

    Updating 61b2234..53123d2
Fast-forward
 docs/metadata-workflow.rst                         |  6 ++-
 swh/indexer/codemeta.py                            | 23 +++++---
 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             | 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 +-
 .../tests/metadata_dictionary/test_github.py       | 16 ++++--
 14 files changed, 107 insertions(+), 61 deletions(-)
    Changes applied before test
    commit 53123d264734a2f04099e73900e8711638ffa183
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 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/325/ for more details.

  • vlorentz
    vlorentz @vlorentz ·
    Author Maintainer

    rebase

  • Software Heritage Continuous Integration for public repositories
    Software Heritage Continuous Integration for public repositories @swh-public-ci ·

    Build is green

    Patch application report for D8073 (id=29170)

    Could not rebase; Attempt merge onto ff2730c3...

    Updating ff2730c..a2d5935
Fast-forward
 docs/metadata-workflow.rst                         |  6 ++-
 swh/indexer/codemeta.py                            | 23 +++++---
 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             | 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 +-
 .../tests/metadata_dictionary/test_github.py       | 16 ++++--
 15 files changed, 109 insertions(+), 63 deletions(-)
    Changes applied before test
    commit a2d5935b9a0fb68a7038b4aaf8eed24c93b4e3ee
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 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/334/ for more details.

  • vlorentz
    vlorentz @vlorentz ·
    Author Maintainer

    rebase

  • Software Heritage Continuous Integration for public repositories
    Software Heritage Continuous Integration for public repositories @swh-public-ci ·

    Build is green

    Patch application report for D8073 (id=29172)

    Could not rebase; Attempt merge onto ff2730c3...

    Updating ff2730c..358ee08
Fast-forward
 docs/metadata-workflow.rst                         |  6 ++-
 swh/indexer/codemeta.py                            | 23 +++++---
 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             | 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 ++--
 .../tests/metadata_dictionary/test_github.py       | 16 ++++--
 15 files changed, 112 insertions(+), 75 deletions(-)
    Changes applied before test
    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

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/336/ for more details.

  • Antoine Lambert
    Antoine Lambert @anlambert ·
    Maintainer

    Merge request was accepted

  • Antoine Lambert approved this merge request

    approved this merge request

  • vlorentz
    vlorentz @vlorentz ·
    Author Maintainer

    Merge request was merged

  • vlorentz closed

    closed

Please register or sign in to reply