Page MenuHomeSoftware Heritage

Fix SWORD XMLNS (http://purl.org/net/sword/ -> http://purl.org/net/sword/terms/)
ClosedPublic

Authored by vlorentz on Thu, Nov 19, 2:45 PM.

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

vlorentz created this revision.Thu, Nov 19, 2:45 PM

Build has FAILED

Patch application report for D4527 (id=16041)

Could not rebase; Attempt merge onto 85416fb165...

Updating 85416fb1..af8ced8f
Fast-forward
 swh/deposit/parsers.py                             |  2 +-
 swh/deposit/templates/deposit/content.xml          | 23 +++++++++++-----------
 swh/deposit/templates/deposit/deposit_receipt.xml  | 13 ++++++++++--
 swh/deposit/templates/deposit/error.xml            |  2 +-
 swh/deposit/templates/deposit/status.xml           | 18 +++++++++++++++--
 .../tests/api/test_collection_post_binary.py       |  6 ++++++
 swh/deposit/tests/api/test_get_file.py             |  4 ++--
 .../tests/data/https_deposit.swh.test/1_test       | 10 +++++++++-
 .../tests/data/https_deposit.test.metadata/1_test  | 12 +++++++++--
 .../1_test_666_metadata                            | 11 +++++++++--
 .../https_deposit.test.metadata/1_test_666_status  |  2 +-
 .../https_deposit.test.status/1_test_1033_status   |  2 +-
 .../1_test_123_metadata                            |  2 +-
 .../1_test_123_status                              |  2 +-
 .../1_test_321_status                              |  2 +-
 swh/deposit/urls.py                                |  2 +-
 16 files changed, 83 insertions(+), 30 deletions(-)
Changes applied before test
commit af8ced8f06844e4ad07ccc6ec0b11bf7d12fe86d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 14:45:21 2020 +0100

    Fix SWORD XMLNS (http://purl.org/net/sword/ -> http://purl.org/net/sword/terms/)

commit 83f46bbebb78667b4596b42aad074e47ffc6ccd1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 14:00:10 2020 +0100

    Remove useless 'type: ignore' annotation.
    
    mypy complains about it.

commit ca3422a27365c543db76db003cc2c82b329dc29b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:59:37 2020 +0100

    Move SWH-specific tags to the https://www.softwareheritage.org/schema/2018/deposit namespace
    
    They don't belong in SWORD.
    
    We're keeping the old ones for existing clients, and we will have to
    notify them of the change before removing the old tags.

commit 918d39057abe4a9194b0f7a0cc04e39bd297ec13
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:56:39 2020 +0100

    Remove <sword:request>.
    
    Motivation:
    
    1. it is not a SWORD tag
    2. I don't think there is any use for this
    3. Its content is buggy, as it only handles one level of hierarchy for the metadata values.

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

Build has FAILED

Patch application report for D4527 (id=16052)

Could not rebase; Attempt merge onto 85416fb165...

Updating 85416fb1..b56b1eff
Fast-forward
 swh/deposit/parsers.py                             |  2 +-
 swh/deposit/templates/deposit/content.xml          | 23 +++++++++++-----------
 swh/deposit/templates/deposit/deposit_receipt.xml  | 13 ++++++++++--
 swh/deposit/templates/deposit/error.xml            |  2 +-
 swh/deposit/templates/deposit/status.xml           | 18 +++++++++++++++--
 swh/deposit/tests/api/test_collection.py           |  6 +++---
 .../tests/api/test_collection_post_binary.py       |  6 ++++++
 .../tests/api/test_deposit_private_check.py        |  2 +-
 swh/deposit/tests/api/test_deposit_schedule.py     |  2 +-
 swh/deposit/tests/api/test_get_file.py             |  4 ++--
 swh/deposit/tests/cli/test_client.py               |  2 +-
 .../tests/data/https_deposit.swh.test/1_test       | 10 +++++++++-
 .../tests/data/https_deposit.test.metadata/1_test  | 12 +++++++++--
 .../1_test_666_metadata                            | 11 +++++++++--
 .../https_deposit.test.metadata/1_test_666_status  |  2 +-
 .../https_deposit.test.status/1_test_1033_status   |  2 +-
 .../1_test_123_metadata                            |  2 +-
 .../1_test_123_status                              |  2 +-
 .../1_test_321_status                              |  2 +-
 19 files changed, 88 insertions(+), 35 deletions(-)
Changes applied before test
commit b56b1eff6083759dab3d3e67701aff294557804e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 14:45:21 2020 +0100

    Fix SWORD XMLNS (http://purl.org/net/sword/ -> http://purl.org/net/sword/terms/)

commit 36f75b434cfe6954f9959cda0180f6807b96e89f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:59:37 2020 +0100

    Move SWH-specific tags to the https://www.softwareheritage.org/schema/2018/deposit namespace
    
    They don't belong in SWORD.
    
    We're keeping the old ones for existing clients, and we will have to
    notify them of the change before removing the old tags.

commit 918d39057abe4a9194b0f7a0cc04e39bd297ec13
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:56:39 2020 +0100

    Remove <sword:request>.
    
    Motivation:
    
    1. it is not a SWORD tag
    2. I don't think there is any use for this
    3. Its content is buggy, as it only handles one level of hierarchy for the metadata values.

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

Build is green

Patch application report for D4527 (id=16104)

Could not rebase; Attempt merge onto cb733dd49a...

Updating cb733dd4..0d7948b2
Fast-forward
 docs/endpoints/collection.rst                      | 17 ++++++---
 docs/endpoints/content.rst                         | 43 ++++++----------------
 docs/endpoints/status.rst                          | 28 +++++++++-----
 swh/deposit/parsers.py                             |  2 +-
 swh/deposit/templates/deposit/content.xml          | 23 ++++++------
 swh/deposit/templates/deposit/deposit_receipt.xml  | 13 ++++++-
 swh/deposit/templates/deposit/error.xml            |  2 +-
 swh/deposit/templates/deposit/status.xml           | 18 ++++++++-
 swh/deposit/tests/api/test_collection.py           |  6 +--
 .../tests/api/test_collection_post_binary.py       |  6 +++
 .../tests/api/test_deposit_private_check.py        |  2 +-
 swh/deposit/tests/api/test_deposit_schedule.py     |  2 +-
 swh/deposit/tests/api/test_get_file.py             |  4 +-
 swh/deposit/tests/cli/test_client.py               |  7 ----
 .../tests/data/https_deposit.swh.test/1_test       | 10 ++++-
 .../tests/data/https_deposit.test.metadata/1_test  | 12 +++++-
 .../1_test_666_metadata                            | 11 +++++-
 .../https_deposit.test.metadata/1_test_666_status  |  2 +-
 .../https_deposit.test.status/1_test_1033_status   |  2 +-
 .../1_test_123_metadata                            |  2 +-
 .../1_test_123_status                              |  2 +-
 .../1_test_321_status                              |  2 +-
 22 files changed, 129 insertions(+), 87 deletions(-)
Changes applied before test
commit 0d7948b2f393f9f3145bb8be34b81313d4c8d86a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 14:45:21 2020 +0100

    Fix SWORD XMLNS (http://purl.org/net/sword/ -> http://purl.org/net/sword/terms/)

commit 0ef9273dd85904185116d123fdc55be2a3149dc0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:59:37 2020 +0100

    Move SWH-specific tags to the https://www.softwareheritage.org/schema/2018/deposit namespace
    
    They don't belong in SWORD.
    
    We're keeping the old ones for existing clients, and we will have to
    notify them of the change before removing the old tags.

commit 8ff2e68d8c32ebed6b11f062f643612e6a569725
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:56:39 2020 +0100

    Remove <sword:request>.
    
    Motivation:
    
    1. it is not a SWORD tag
    2. I don't think there is any use for this
    3. Its content is buggy, as it only handles one level of hierarchy for the metadata values.

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

douardda accepted this revision.Fri, Nov 20, 3:32 PM
douardda added a subscriber: douardda.

if we are confident this really is the correct URI, lgtm

This revision is now accepted and ready to land.Fri, Nov 20, 3:32 PM

Build is green

Patch application report for D4527 (id=16128)

Could not rebase; Attempt merge onto f4b4c25e44...

Updating f4b4c25e..aa7e2b1c
Fast-forward
 docs/endpoints/collection.rst                      | 17 ++++++---
 docs/endpoints/content.rst                         | 43 ++++++----------------
 docs/endpoints/status.rst                          | 28 +++++++++-----
 swh/deposit/templates/deposit/content.xml          | 23 ++++++------
 swh/deposit/templates/deposit/deposit_receipt.xml  | 13 ++++++-
 swh/deposit/templates/deposit/error.xml            |  2 +-
 swh/deposit/templates/deposit/status.xml           | 18 ++++++++-
 swh/deposit/tests/api/test_collection.py           |  6 +--
 .../tests/api/test_collection_post_binary.py       |  6 +++
 .../tests/api/test_deposit_private_check.py        |  2 +-
 swh/deposit/tests/api/test_deposit_schedule.py     |  2 +-
 swh/deposit/tests/api/test_get_file.py             |  4 +-
 swh/deposit/tests/cli/test_client.py               |  7 ----
 .../tests/data/https_deposit.swh.test/1_test       | 10 ++++-
 .../tests/data/https_deposit.test.metadata/1_test  | 12 +++++-
 .../1_test_666_metadata                            | 11 +++++-
 .../https_deposit.test.metadata/1_test_666_status  |  2 +-
 .../https_deposit.test.status/1_test_1033_status   |  2 +-
 .../1_test_123_metadata                            |  2 +-
 .../1_test_123_status                              |  2 +-
 .../1_test_321_status                              |  2 +-
 swh/deposit/utils.py                               |  2 +-
 22 files changed, 129 insertions(+), 87 deletions(-)
Changes applied before test
commit aa7e2b1c743d3b587bc48fa57e3df3b5962d5214
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 14:45:21 2020 +0100

    Fix SWORD XMLNS (http://purl.org/net/sword/ -> http://purl.org/net/sword/terms/)

commit 794402c0f52a312bf53c757b650795f0ceb0e50a
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:59:37 2020 +0100

    Move SWH-specific tags to the https://www.softwareheritage.org/schema/2018/deposit namespace
    
    They don't belong in SWORD.
    
    We're keeping the old ones for existing clients, and we will have to
    notify them of the change before removing the old tags.

commit 405b577f42efdb678aefa044b10599c7d2a1e97b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Nov 19 13:56:39 2020 +0100

    Remove <sword:request>.
    
    Motivation:
    
    1. it is not a SWORD tag
    2. I don't think there is any use for this
    3. Its content is buggy, as it only handles one level of hierarchy for the metadata values.

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