Page MenuHomeSoftware Heritage
Differential D7317

Add more simpletypes to the schema.
ClosedPublic
Actions

Authored by vlorentz on Mar 8 2022, 5:43 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Maniphest Tasks
T3965: deposit: Validate Atom documents are well-formed
Commits
rDDEP172e8d55f41a: Add more simpletypes to the schema.
Summary

Depends on D7316.

Diff Detail

Unit TestsFailed
View All

TimeTest
528 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko_schema[maintainer-with-no-name]
metadata_ko = '<entry xmlns="http://www.w3.org/2005/Atom"\n xmlns:swh="https://www.softwareheritage.org/schema/2018/deposit"\n...hema:url>some-metadata-provenance-url</schema:url>\n </swh:metadata-provenance>\n </swh:deposit>\n</entry>\n' expected_summaries = [{'fields': ['codemeta:maintainer'], 'summary': ".*Tag '?codemeta:name'? expected.*"}] swh_checks_deposit = <swh.deposit.api.private.deposit_check.APIChecks object at 0x7f0fc1af1e48>
615 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.cli.test_client::test_cli_client_generate_metadata_ok
slug = 'b2ed8580-7c1d-47c0-96a5-b6531e85468b' def test_cli_client_generate_metadata_ok(slug):
1,600 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_basic_auth::test_service_document_basic
430 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[no-author]
727 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.deposit.tests.api.test_checks::test_api_checks_check_metadata_ko[no-name-or-title]
View Full Test Results (2 Failed · 317 Passed)

Event Timeline

vlorentz created this revision.Mar 8 2022, 5:43 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 8 2022, 5:43 PM
vlorentz added a child revision: D7318: Add more Person fields to the schema.Mar 8 2022, 5:43 PM
swh-public-ci added a comment.Mar 8 2022, 5:50 PM

Build has FAILED

Patch application report for D7317 (id=26462)

Could not rebase; Attempt merge onto cac1511329...

Merge made by the 'recursive' strategy.
 swh/deposit/api/checks.py            |  40 ++++-
 swh/deposit/tests/api/test_checks.py | 290 ++++++++++++++++++++++++++++++++---
 swh/deposit/xsd/codemeta.xsd         |  24 +++
 3 files changed, 329 insertions(+), 25 deletions(-)
Changes applied before test
commit 1e59b11a9c08273f2a332f62a73b049d921b4440
Merge: cac15113 8fc58289
Author: Jenkins user <jenkins@localhost>
Date:   Tue Mar 8 16:43:37 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 8fc582894c08fb1cd65c0a0dc6557404fcfa1935
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:23:07 2022 +0100

    Add more simpletypes to the schema.

commit 96706f67cf53dbb76bce84232c954b1f322b8ab4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:17:55 2022 +0100

    Add <codemeta:affiliation> to the schema.

commit 6e85cb9fdcbe5ee1e19d3cc1bcfd1fa42639b56b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:46:56 2022 +0100

    test_checks: Make failure more readable

commit 4d3653e309fe0f8a1b895cbe24389a9239baa3d1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:36:23 2022 +0100

    test_checks: Add names to pytest parameters + reorder them + remove duplicate
    
    It makes it easier to identify tests when failing + helps git to
    make readable diffs.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Mar 8 2022, 5:50 PM
Harbormaster failed remote builds in B27347: Diff 26462!
vlorentz updated this revision to Diff 26467.Mar 8 2022, 6:04 PM

fix test

swh-public-ci added a comment.Mar 8 2022, 6:10 PM

Build is green

Patch application report for D7317 (id=26467)

Could not rebase; Attempt merge onto cac1511329...

Merge made by the 'recursive' strategy.
 swh/deposit/api/checks.py            |  40 +++++-
 swh/deposit/tests/api/test_checks.py | 268 ++++++++++++++++++++++++++++++++---
 swh/deposit/tests/cli/test_client.py |   4 +-
 swh/deposit/xsd/codemeta.xsd         |  24 ++++
 4 files changed, 309 insertions(+), 27 deletions(-)
Changes applied before test
commit ee73ddfe7aa90c541cd291c0cc58f9bffe8f5a8e
Merge: cac15113 e8dd85b6
Author: Jenkins user <jenkins@localhost>
Date:   Tue Mar 8 17:05:04 2022 +0000

    Merge branch 'diff-target' into HEAD

commit e8dd85b6b6164155882ce49ddc2a3f4b0cff5f08
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:23:07 2022 +0100

    Add more simpletypes to the schema.

commit 96706f67cf53dbb76bce84232c954b1f322b8ab4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:17:55 2022 +0100

    Add <codemeta:affiliation> to the schema.

commit 6e85cb9fdcbe5ee1e19d3cc1bcfd1fa42639b56b
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:46:56 2022 +0100

    test_checks: Make failure more readable

commit 4d3653e309fe0f8a1b895cbe24389a9239baa3d1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:36:23 2022 +0100

    test_checks: Add names to pytest parameters + reorder them + remove duplicate
    
    It makes it easier to identify tests when failing + helps git to
    make readable diffs.

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

Harbormaster completed remote builds in B27352: Diff 26467.Mar 8 2022, 6:11 PM
vlorentz requested review of this revision.Mar 8 2022, 6:11 PM
vlorentz updated this revision to Diff 26474.Mar 8 2022, 6:11 PM

rebase

swh-public-ci added a comment.Mar 8 2022, 6:19 PM

Build is green

Patch application report for D7317 (id=26474)

Could not rebase; Attempt merge onto cac1511329...

Updating cac15113..2ec5a89a
Fast-forward
 swh/deposit/api/checks.py            |  40 +++++-
 swh/deposit/tests/api/test_checks.py | 268 ++++++++++++++++++++++++++++++++---
 swh/deposit/tests/cli/test_client.py |   4 +-
 swh/deposit/xsd/codemeta.xsd         |  24 ++++
 4 files changed, 309 insertions(+), 27 deletions(-)
Changes applied before test
commit 2ec5a89af955992f5c7dbbd63f3ee63573b47a03
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:23:07 2022 +0100

    Add more simpletypes to the schema.

commit 043b96dad34dd7b4a351db8bfcac60e681839b0d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:17:55 2022 +0100

    Add <codemeta:affiliation> to the schema.

commit e288319cfe7d048bff09556bb6c5aae75eb3a7b2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:46:56 2022 +0100

    test_checks: Make failure more readable

commit fb702b02ad6a7c218350900d4f45a2093cd5e9ad
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 11:36:23 2022 +0100

    test_checks: Add names to pytest parameters + reorder them + remove duplicate
    
    It makes it easier to identify tests when failing + helps git to
    make readable diffs.

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

Harbormaster completed remote builds in B27359: Diff 26474.Mar 8 2022, 6:19 PM
vlorentz added a task: T3965: deposit: Validate Atom documents are well-formed.Mar 14 2022, 10:33 AM
ardumont accepted this revision.Mar 18 2022, 5:38 PM
ardumont added a subscriber: ardumont.

lgtm

one question inline.

swh/deposit/api/checks.py
35

are those types a pain to add?

This revision is now accepted and ready to land.Mar 18 2022, 5:38 PM
vlorentz added inline comments.Mar 21 2022, 10:16 AM
swh/deposit/api/checks.py
35

https://github.com/sissaschool/xmlschema/issues/291

vlorentz added inline comments.Mar 21 2022, 10:37 AM
swh/deposit/api/checks.py
35

and D7397

vlorentz updated this revision to Diff 26729.Mar 21 2022, 10:39 AM

rebase

swh-public-ci added a comment.Mar 21 2022, 10:47 AM

Build is green

Patch application report for D7317 (id=26729)

Rebasing onto 6f37ab6eb7...

Current branch diff-target is up to date.
Changes applied before test
commit 172e8d55f41ae18cff532520abdb701945bde335
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Feb 28 12:23:07 2022 +0100

    Add more simpletypes to the schema.

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

Harbormaster completed remote builds in B27624: Diff 26729.Mar 21 2022, 10:47 AM
Closed by commit rDDEP172e8d55f41a: Add more simpletypes to the schema. (authored by vlorentz). · Explain WhyMar 22 2022, 11:14 AM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDDEP172e8d55f41a: Add more simpletypes to the schema..

Revision Contents
Changeset List

PathSize
swh/
deposit/
api/
40 lines
tests/
api/
185 lines
xsd/
19 lines

Diff 26462

View Options

swh/deposit/api/checks.py

Loading...
View Options

swh/deposit/tests/api/test_checks.py

Loading...
View Options

swh/deposit/xsd/codemeta.xsd

Loading...
About · Developer information · Legal