Page MenuHomeSoftware Heritage
Differential D7244

Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema
ClosedPublic
Actions

Authored by vlorentz on Feb 24 2022, 1:35 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Maniphest Tasks
T3965: deposit: Validate Atom documents are well-formed
Commits
rDDEPb49d5e6ab16b: Enforce create_origin/add_to_origin/reference are mutually exclusive in the…

Diff Detail

Event Timeline

vlorentz created this revision.Feb 24 2022, 1:35 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptFeb 24 2022, 1:35 PM
swh-public-ci added a comment.Feb 24 2022, 1:36 PM

Build has FAILED

Patch application report for D7244 (id=26255)

Could not rebase; Attempt merge onto ccff46762b...

Removing docs/specs/swh.xsd
Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 docs/specs/protocol-reference.rst                  |   2 +-
 docs/specs/swh.xsd                                 |  60 ----
 mypy.ini                                           |   3 +
 requirements-server.txt                            |   1 +
 swh/deposit/api/checks.py                          |  27 ++
 swh/deposit/tests/api/test_checks.py               | 302 ++++++++++++++++++++-
 .../{tests_migration => tests}/test_migrations.py  |   0
 swh/deposit/xsd/swh.xsd                            |  81 ++++++
 9 files changed, 401 insertions(+), 76 deletions(-)
 delete mode 100644 docs/specs/swh.xsd
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)
 create mode 100644 swh/deposit/xsd/swh.xsd
Changes applied before test
commit 09702a196c086c21bcf1c3d0119cae4c4a362fda
Merge: ccff4676 0f532ad1
Author: Jenkins user <jenkins@localhost>
Date:   Thu Feb 24 12:36:03 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 0f532ad195287e537518fdb56cc8336651571ca1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:35:42 2022 +0100

    Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema

commit 18dea765d6aea395d319c0ebffed282d7b8b35e0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:30:33 2022 +0100

    Add schema validation of <swh:deposit> using swh.xsd

commit 89c086661371c7dad7b661fb967b451c41b5d955
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit d2d904a283a1434d30cf8c68bfc9e708753f705f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit d56f08cb83bd25c70a8cb4bafc6df71b6844f5d2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 24 2022, 1:36 PM
Harbormaster failed remote builds in B27126: Diff 26255!
vlorentz updated this revision to Diff 26257.Feb 24 2022, 1:38 PM

fix typing

swh-public-ci added a comment.Feb 24 2022, 1:39 PM

Build has FAILED

Patch application report for D7244 (id=26257)

Could not rebase; Attempt merge onto ccff46762b...

Removing docs/specs/swh.xsd
Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 docs/specs/protocol-reference.rst                  |   2 +-
 docs/specs/swh.xsd                                 |  60 ----
 mypy.ini                                           |   3 +
 requirements-server.txt                            |   1 +
 swh/deposit/api/checks.py                          |  27 ++
 swh/deposit/tests/api/test_checks.py               | 302 ++++++++++++++++++++-
 .../{tests_migration => tests}/test_migrations.py  |   0
 swh/deposit/xsd/swh.xsd                            |  81 ++++++
 9 files changed, 401 insertions(+), 76 deletions(-)
 delete mode 100644 docs/specs/swh.xsd
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)
 create mode 100644 swh/deposit/xsd/swh.xsd
Changes applied before test
commit fa0916b3af1d83c946721306dd1470b2d8d993b2
Merge: ccff4676 8e84d243
Author: Jenkins user <jenkins@localhost>
Date:   Thu Feb 24 12:38:10 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 8e84d243319fdee7a58e67eaf87a3bd5492c5547
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:35:42 2022 +0100

    Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema

commit 51f4f659e2eece91ff0513d5d85c07208b8d269c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:30:33 2022 +0100

    Add schema validation of <swh:deposit> using swh.xsd

commit 89c086661371c7dad7b661fb967b451c41b5d955
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit d2d904a283a1434d30cf8c68bfc9e708753f705f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit d56f08cb83bd25c70a8cb4bafc6df71b6844f5d2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 24 2022, 1:39 PM
Harbormaster failed remote builds in B27128: Diff 26257!
vlorentz updated this revision to Diff 26260.Feb 24 2022, 1:40 PM

fix typing again

swh-public-ci added a comment.Feb 24 2022, 1:47 PM

Build has FAILED

Patch application report for D7244 (id=26260)

Could not rebase; Attempt merge onto ccff46762b...

Removing docs/specs/swh.xsd
Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 docs/specs/protocol-reference.rst                  |   2 +-
 docs/specs/swh.xsd                                 |  60 ----
 mypy.ini                                           |   3 +
 requirements-server.txt                            |   1 +
 swh/deposit/api/checks.py                          |  27 ++
 swh/deposit/tests/api/test_checks.py               | 302 ++++++++++++++++++++-
 .../{tests_migration => tests}/test_migrations.py  |   0
 swh/deposit/xsd/swh.xsd                            |  81 ++++++
 9 files changed, 401 insertions(+), 76 deletions(-)
 delete mode 100644 docs/specs/swh.xsd
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)
 create mode 100644 swh/deposit/xsd/swh.xsd
Changes applied before test
commit 2fcc55c39419b905e1f8f7909c5fce05a649f6e1
Merge: ccff4676 e5b21b42
Author: Jenkins user <jenkins@localhost>
Date:   Thu Feb 24 12:41:05 2022 +0000

    Merge branch 'diff-target' into HEAD

commit e5b21b42f043975941c1e55147298ce6c9716f69
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:35:42 2022 +0100

    Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema

commit db145054e2b29b3a24b688cc38bf2419ccf1ffcb
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:30:33 2022 +0100

    Add schema validation of <swh:deposit> using swh.xsd

commit 89c086661371c7dad7b661fb967b451c41b5d955
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit d2d904a283a1434d30cf8c68bfc9e708753f705f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit d56f08cb83bd25c70a8cb4bafc6df71b6844f5d2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 24 2022, 1:47 PM
Harbormaster failed remote builds in B27131: Diff 26260!
vlorentz updated this revision to Diff 26262.Feb 24 2022, 1:58 PM

rebase

swh-public-ci added a comment.Feb 24 2022, 2:05 PM

Build is green

Patch application report for D7244 (id=26262)

Could not rebase; Attempt merge onto ccff46762b...

Removing docs/specs/swh.xsd
Merge made by the 'recursive' strategy.
 MANIFEST.in                                        |   1 +
 docs/specs/protocol-reference.rst                  |   4 +-
 docs/specs/swh.xsd                                 |  60 ----
 mypy.ini                                           |   3 +
 requirements-server.txt                            |   1 +
 swh/deposit/api/checks.py                          |  27 ++
 swh/deposit/tests/api/test_checks.py               | 302 ++++++++++++++++++++-
 .../{tests_migration => tests}/test_migrations.py  |   0
 swh/deposit/xsd/swh.xsd                            |  81 ++++++
 9 files changed, 401 insertions(+), 78 deletions(-)
 delete mode 100644 docs/specs/swh.xsd
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)
 create mode 100644 swh/deposit/xsd/swh.xsd
Changes applied before test
commit 8722a8f2dc4ce364fd3f22b58f8f11ad2f40c941
Merge: ccff4676 fb205f30
Author: Jenkins user <jenkins@localhost>
Date:   Thu Feb 24 12:58:19 2022 +0000

    Merge branch 'diff-target' into HEAD

commit fb205f30fc92eb35631705cdb6ec9b639f6fe6b1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:35:42 2022 +0100

    Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema

commit a0d5f3a6c4800f6ee460b30ad6eee04caf523e89
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:30:33 2022 +0100

    Add schema validation of <swh:deposit> using swh.xsd

commit 89c086661371c7dad7b661fb967b451c41b5d955
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit d2d904a283a1434d30cf8c68bfc9e708753f705f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit d56f08cb83bd25c70a8cb4bafc6df71b6844f5d2
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster completed remote builds in B27133: Diff 26262.Feb 24 2022, 2:05 PM
vlorentz requested review of this revision.Feb 24 2022, 2:05 PM
vlorentz added a child revision: D7249: Use xmlschema to validate dates, instead of custom code..Feb 24 2022, 4:05 PM
vlorentz added a parent revision: D7243: Add schema validation of <swh:deposit> using swh.xsd.
vlorentz added a task: T3965: deposit: Validate Atom documents are well-formed.Feb 24 2022, 4:32 PM
ardumont accepted this revision.Feb 24 2022, 5:39 PM
ardumont added a subscriber: ardumont.

*thumbs up*

This revision is now accepted and ready to land.Feb 24 2022, 5:39 PM
vlorentz updated this revision to Diff 26303.Feb 28 2022, 10:20 AM

rebase

swh-public-ci added a comment.Feb 28 2022, 10:27 AM

Build is green

Patch application report for D7244 (id=26303)

Could not rebase; Attempt merge onto ccff46762b...

Updating ccff4676..b49d5e6a
Fast-forward
 MANIFEST.in                                        |   1 +
 docs/specs/protocol-reference.rst                  |   4 +-
 docs/specs/swh.xsd                                 |  60 ----
 mypy.ini                                           |   3 +
 requirements-server.txt                            |   1 +
 swh/deposit/api/checks.py                          |  27 ++
 swh/deposit/tests/api/test_checks.py               | 302 ++++++++++++++++++++-
 .../{tests_migration => tests}/test_migrations.py  |   0
 swh/deposit/xsd/swh.xsd                            |  81 ++++++
 9 files changed, 401 insertions(+), 78 deletions(-)
 delete mode 100644 docs/specs/swh.xsd
 rename swh/deposit/{tests_migration => tests}/test_migrations.py (100%)
 create mode 100644 swh/deposit/xsd/swh.xsd
Changes applied before test
commit b49d5e6ab16bdc53bfcd7b942e4feebac7b19cf8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:35:42 2022 +0100

    Enforce create_origin/add_to_origin/reference are mutually exclusive in the schema

commit e087956040e35eee914135b4ec2871b04dd192c4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:30:33 2022 +0100

    Add schema validation of <swh:deposit> using swh.xsd

commit 0a6c03965a7a5446884ca07d21b7e03d6ab145c4
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 13:24:10 2022 +0100

    Improve readability of pytest errors by removing unnecessary whitespaces
    
    The leading newline prevented textwrap.dedent from removing them.

commit 2e95623c6c7783ed407fa721f09289742ecccab8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:13:50 2022 +0100

    Fix swh.xsd
    
    It was never actually tested...

commit 8a7e0832641bda3b4c445793cfb92e3de6c5947e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Feb 24 12:04:03 2022 +0100

    Move tests_migration/test_migrations.py to tests/test_migrations.py
    
    This fixes crashes when running 'pytest -k migration', because swh/deposit/tests_migration/
    lacks a conftest to initialize the database.

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

Harbormaster completed remote builds in B27176: Diff 26303.Feb 28 2022, 10:27 AM
Closed by commit rDDEPb49d5e6ab16b: Enforce create_origin/add_to_origin/reference are mutually exclusive in the… (authored by vlorentz). · Explain WhyFeb 28 2022, 11:01 AM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDDEPb49d5e6ab16b: Enforce create_origin/add_to_origin/reference are mutually exclusive in the….

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
deposit/
tests/
api/
78 lines100%
Loading...
xsd/
21 lines--

Diff 26303

View Options

swh/deposit/tests/api/test_checks.py

Loading...
View Options

swh/deposit/xsd/swh.xsd

Loading...
About · Developer information · Legal