In a future commit, the origin_url computation will only be a fallback
in case it's not provided in any of the Atom entries; so we have
to compute this fallback after all Atom entries are given, ie. when
the deposit completes.
Details
Details
- Reviewers
ardumont - Group Reviewers
Reviewers - Maniphest Tasks
- T2806: Add tag in the deposit protocol to allow client to specify an origin
- Commits
- rDDEPe7316d6d8a52: Defer origin_url computation until the deposit completes.
Diff Detail
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
Comment Actions
Build is green
Patch application report for D4603 (id=16341)
Could not rebase; Attempt merge onto ad6041d312...
Updating ad6041d3..45b596f1 Fast-forward docs/specs/swh.xsd | 35 ++++++++++++++-------- swh/deposit/api/common.py | 10 ++++++- .../0021_deposit_origin_url_20201124_1438.py | 28 +++++++++++++++++ swh/deposit/models.py | 9 +++--- .../api/test_deposit_private_read_metadata.py | 13 ++++---- 5 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 swh/deposit/migrations/0021_deposit_origin_url_20201124_1438.py
Changes applied before test
commit 45b596f198df963edb2d6f5353763704b16fd05d Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Wed Nov 25 15:50:47 2020 +0100 Defer origin_url computation until the deposit completes. In a future commit, the origin_url computation will only be a fallback in case it's not provided in any of the Atom entries; so we have to compute this fallback after all Atom entries are given, ie. when the deposit completes. commit 1a2da5e1805f7d65cdd6c22b6180ad6fb00d623a Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 15:52:36 2020 +0100 add column 'origin_url' on Deposit. For now, it's only computed based on the external_id, but clients will provide it in future versions. commit 2e4a524a2480dbd3baa6f59390528fd694ea7390 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 12:20:19 2020 +0100 swh.xsd: Use the https://www.softwareheritage.org/schema/2018/deposit namespace commit 88b102aec44185b97b06135d862821bb4c138acc Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 12:11:31 2020 +0100 swh.xsd: Improve readability This also moves the inner element definitions of <swh:reference> to root elements, so they can be reused by new definitions in the future.
See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/443/ for more details.
Comment Actions
Build is green
Patch application report for D4603 (id=16377)
Could not rebase; Attempt merge onto ad6041d312...
Updating ad6041d3..e7316d6d Fast-forward docs/specs/swh.xsd | 35 ++++++++++++++-------- swh/deposit/api/common.py | 10 ++++++- .../0021_deposit_origin_url_20201124_1438.py | 28 +++++++++++++++++ swh/deposit/models.py | 9 +++--- .../api/test_deposit_private_read_metadata.py | 13 ++++---- 5 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 swh/deposit/migrations/0021_deposit_origin_url_20201124_1438.py
Changes applied before test
commit e7316d6d8a527eb4a96eb2e9d46daa0045c6b851 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Wed Nov 25 15:50:47 2020 +0100 Defer origin_url computation until the deposit completes. In a future commit, the origin_url computation will only be a fallback in case it's not provided in any of the Atom entries; so we have to compute this fallback after all Atom entries are given, ie. when the deposit completes. commit a21961284e3b88a3c21fc0b67cae793351331e7f Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 15:52:36 2020 +0100 add column 'origin_url' on Deposit. For now, it's only computed based on the external_id, but clients will provide it in future versions. commit 2e4a524a2480dbd3baa6f59390528fd694ea7390 Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 12:20:19 2020 +0100 swh.xsd: Use the https://www.softwareheritage.org/schema/2018/deposit namespace commit 88b102aec44185b97b06135d862821bb4c138acc Author: Valentin Lorentz <vlorentz@softwareheritage.org> Date: Tue Nov 24 12:11:31 2020 +0100 swh.xsd: Improve readability This also moves the inner element definitions of <swh:reference> to root elements, so they can be reused by new definitions in the future.
See https://jenkins.softwareheritage.org/job/DDEP/job/tests-on-diff/454/ for more details.