Page MenuHomeSoftware Heritage

Fix URI of schema.org
ClosedPublic

Authored by vlorentz on Feb 21 2022, 5:07 PM.

Details

Summary

Either is valid according to https://schema.org/docs/gs.html ;
but we need to pick one, as they are opaque identifiers.
And codemeta chose http:// (because it was the only one to be
valid back then), so we should stick to this one.

Sorry @ardumont, I made the mistake in D7174

Diff Detail

Repository
rDDEP Push deposit
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build has FAILED

Patch application report for D7212 (id=26142)

Could not rebase; Attempt merge onto 40adc8c23b...

Updating 40adc8c2..efc14e49
Fast-forward
 swh/deposit/api/private/__init__.py                | 24 +++---
 swh/deposit/api/private/deposit_check.py           |  1 +
 swh/deposit/api/private/deposit_read.py            |  2 +-
 .../api/test_deposit_private_read_metadata.py      | 80 +++++++-------------
 .../atom/entry-data-with-metadata-provenance.xml   |  2 +-
 swh/deposit/tests/data/atom/entry-data2.xml        |  6 ++
 swh/deposit/tests/data/atom/entry-data3.xml        |  8 +-
 swh/deposit/tests/test_utils.py                    | 88 +---------------------
 swh/deposit/utils.py                               | 52 +------------
 9 files changed, 55 insertions(+), 208 deletions(-)
Changes applied before test
commit efc14e494507c10384fd8509c990e4a3d6623a3e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 21 17:06:55 2022 +0100

    Fix URI of schema.org
    
    Either is valid according to https://schema.org/docs/gs.html ;
    but we need to pick one, as they are opaque identifiers.
    And codemeta chose http:// (because it was the only one to be
    valid back then), so we should stick to this one.

commit a25afe62bd1ea0452ef2e395575d1ec64382f6b4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 21 16:37:49 2022 +0100

    Remove metadata merging; use only the latest document
    
    We don't use that feature at all as far as I am aware.
    
    I also find that it complicates any metadata handling (especially the validation
    I would like to add in the near future), and probably does not match semantics
    intended by SWORD (merging occurs on PUT requests, as we don't implement PATCH)

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 21 2022, 5:08 PM
Harbormaster failed remote builds in B27013: Diff 26142!

Funny, i can' t publish the diff... to accept it.

This revision is now accepted and ready to land.Feb 22 2022, 9:11 AM

Accepted but i'm pretty sure it's missing some after the rebase.

Build is green

Patch application report for D7212 (id=26156)

Could not rebase; Attempt merge onto 770cc0f515...

Updating 770cc0f5..a10ed57b
Fast-forward
 swh/deposit/api/private/__init__.py                | 24 +++---
 swh/deposit/api/private/deposit_check.py           |  1 +
 swh/deposit/api/private/deposit_read.py            |  2 +-
 .../api/test_deposit_private_read_metadata.py      | 80 +++++++-------------
 .../atom/entry-data-with-metadata-provenance.xml   |  2 +-
 swh/deposit/tests/data/atom/entry-data2.xml        |  6 ++
 swh/deposit/tests/data/atom/entry-data3.xml        |  8 +-
 swh/deposit/tests/test_utils.py                    | 88 +---------------------
 swh/deposit/utils.py                               | 52 +------------
 9 files changed, 55 insertions(+), 208 deletions(-)
Changes applied before test
commit a10ed57bf8e46f404500cb1bec7bd94729eeb513
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 21 17:06:55 2022 +0100

    Fix URI of schema.org
    
    Either is valid according to https://schema.org/docs/gs.html ;
    but we need to pick one, as they are opaque identifiers.
    And codemeta chose http:// (because it was the only one to be
    valid back then), so we should stick to this one.

commit 7727a9c0c8b8d40a8914ae74760a3bf7d35f255b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 21 16:37:49 2022 +0100

    Remove metadata merging; use only the latest document
    
    We don't use that feature at all as far as I am aware.
    
    I also find that it complicates any metadata handling (especially the validation
    I would like to add in the near future), and probably does not match semantics
    intended by SWORD (merging occurs on PUT requests, as we don't implement PATCH)

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

This revision was automatically updated to reflect the committed changes.