diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9a312dfbf..73b7bf56e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ env: BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main jobs: build: - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository + if: github.event_name == 'pull_request' || startsWith(github.event.ref, 'refs/tags/') || startsWith(github.event.ref, 'refs/heads/1.1') || startsWith(github.event.ref, 'refs/heads/1.2') runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index 2a40f9487..f1d29bd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /docs/_static/patched /src *.pyc +.python-version diff --git a/docs/examples/amendments/contract.json b/docs/examples/amendments/contract.json index ad884732d..b4e476a73 100644 --- a/docs/examples/amendments/contract.json +++ b/docs/examples/amendments/contract.json @@ -1,10 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856", - "publisher": { - "name": "Department of Finance" - }, - "publishedDate": "2019-02-17T00:00:00Z", - "license": "https://creativecommons.org/licenses/by/3.0/au/", "version": "1.1", "records": [ { diff --git a/docs/examples/amendments/easy_releases.json b/docs/examples/amendments/easy_releases.json index acd960896..893776dc8 100644 --- a/docs/examples/amendments/easy_releases.json +++ b/docs/examples/amendments/easy_releases.json @@ -1,10 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-d2phr6-1000035663", - "publisher": { - "name": "Department of Finance" - }, - "publishedDate": "", - "license": "https://creativecommons.org/licenses/by/3.0/au/", "version": "1.1", "records": [ { diff --git a/docs/examples/amendments/tender.json b/docs/examples/amendments/tender.json index 42070098d..59975919a 100644 --- a/docs/examples/amendments/tender.json +++ b/docs/examples/amendments/tender.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2016-02-05T10:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/beneficial_ownership/award.json b/docs/examples/beneficial_ownership/award.json index 6d767a220..5f7e91fa3 100644 --- a/docs/examples/beneficial_ownership/award.json +++ b/docs/examples/beneficial_ownership/award.json @@ -1,9 +1,4 @@ { - "uri": "https://www.contractsfinder.service.gov.uk/Published/Notice/releases/87d46d06-3abf-4f48-9f1d-ff3381fcb29a.json", - "publishedDate": "2021-06-08T14:14:33Z", - "publisher": { - "name": "UK SHARED BUSINESS SERVICES LIMITED" - }, "version": "1.1", "releases": [ { diff --git a/docs/examples/beneficial_ownership/beneficial_owners_extension.json b/docs/examples/beneficial_ownership/beneficial_owners_extension.json index 0338e876a..56d6c84ea 100644 --- a/docs/examples/beneficial_ownership/beneficial_owners_extension.json +++ b/docs/examples/beneficial_ownership/beneficial_owners_extension.json @@ -1,9 +1,4 @@ { - "uri": "https://public.mtender.gov.md/ocds/tenders/ocds-b3wdp1-MD-1602178295495", - "publishedDate": "2020-10-08T17:31:35Z", - "publisher": { - "name": "M-Tender" - }, "version": "1.1", "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_beneficialOwners_extension/master/extension.json" diff --git a/docs/examples/change_history/award.json b/docs/examples/change_history/award.json index 61b5d19d4..8c38777ed 100644 --- a/docs/examples/change_history/award.json +++ b/docs/examples/change_history/award.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json", - "publishedDate": "2010-05-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/contract.json b/docs/examples/change_history/contract.json index 1e04369b5..3cce22225 100644 --- a/docs/examples/change_history/contract.json +++ b/docs/examples/change_history/contract.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json", - "publishedDate": "2010-06-10T10:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/contractAmendment.json b/docs/examples/change_history/contractAmendment.json index 9ef4b6373..9d9f0b172 100644 --- a/docs/examples/change_history/contractAmendment.json +++ b/docs/examples/change_history/contractAmendment.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-07-contractAmendment.json", - "publishedDate": "2011-04-05T13:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/implementation.json b/docs/examples/change_history/implementation.json index be29c0aeb..69886001d 100644 --- a/docs/examples/change_history/implementation.json +++ b/docs/examples/change_history/implementation.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-06-implementation.json", - "publishedDate": "2011-01-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/records/award.json b/docs/examples/change_history/records/award.json index 4d385bafb..038bc9434 100644 --- a/docs/examples/change_history/records/award.json +++ b/docs/examples/change_history/records/award.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2010-05-10T09:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/records/contract.json b/docs/examples/change_history/records/contract.json index 36c218659..d10c7edf1 100644 --- a/docs/examples/change_history/records/contract.json +++ b/docs/examples/change_history/records/contract.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2010-06-10T10:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/records/contractAmendment.json b/docs/examples/change_history/records/contractAmendment.json index 9c2f9014e..be26dea14 100644 --- a/docs/examples/change_history/records/contractAmendment.json +++ b/docs/examples/change_history/records/contractAmendment.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2011-04-05T13:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/records/implementation.json b/docs/examples/change_history/records/implementation.json index c3d8b681c..48f1f1f92 100644 --- a/docs/examples/change_history/records/implementation.json +++ b/docs/examples/change_history/records/implementation.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2011-01-10T09:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/records/tender.json b/docs/examples/change_history/records/tender.json index 9835bd757..ac9336840 100644 --- a/docs/examples/change_history/records/tender.json +++ b/docs/examples/change_history/records/tender.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2010-03-15T09:30:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/records/tenderUpdate.json b/docs/examples/change_history/records/tenderUpdate.json index 0d2c372f2..fa31db825 100644 --- a/docs/examples/change_history/records/tenderUpdate.json +++ b/docs/examples/change_history/records/tenderUpdate.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2010-03-20T09:45:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/change_history/tender.json b/docs/examples/change_history/tender.json index 5e26977b1..e4b50b541 100644 --- a/docs/examples/change_history/tender.json +++ b/docs/examples/change_history/tender.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json", - "publishedDate": "2010-03-01T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/tenderAmendment.json b/docs/examples/change_history/tenderAmendment.json index c1b4fe992..46a32709d 100644 --- a/docs/examples/change_history/tenderAmendment.json +++ b/docs/examples/change_history/tenderAmendment.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json", - "publishedDate": "2010-03-20T10:45:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/change_history/tenderUpdate.json b/docs/examples/change_history/tenderUpdate.json index b43289cf2..036f795a0 100644 --- a/docs/examples/change_history/tenderUpdate.json +++ b/docs/examples/change_history/tenderUpdate.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json", - "publishedDate": "2010-03-20T09:45:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.2", "extensions": [], "releases": [ diff --git a/docs/examples/contract_suspension/suspended_contract.json b/docs/examples/contract_suspension/suspended_contract.json index d7fc046b0..e79996884 100644 --- a/docs/examples/contract_suspension/suspended_contract.json +++ b/docs/examples/contract_suspension/suspended_contract.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-afalqw-601848b51321e56ae2593b1b", - "publisher": { - "name": "National Procurement Authority, Afghanistan" - }, - "publishedDate": "2021-02-01T23:00:13+04:30", "version": "1.1", "releases": [ { diff --git a/docs/examples/easy_releases/worked_example1/award.json b/docs/examples/easy_releases/worked_example1/award.json index 9667d7023..0b53d04bf 100644 --- a/docs/examples/easy_releases/worked_example1/award.json +++ b/docs/examples/easy_releases/worked_example1/award.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-27T14:42:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-27T14:42:00Z", diff --git a/docs/examples/easy_releases/worked_example1/contract.json b/docs/examples/easy_releases/worked_example1/contract.json index e36c94a4d..5b77987e9 100644 --- a/docs/examples/easy_releases/worked_example1/contract.json +++ b/docs/examples/easy_releases/worked_example1/contract.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2020-01-11T07:53:50Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2020-01-11T07:53:50Z", diff --git a/docs/examples/easy_releases/worked_example1/tender.json b/docs/examples/easy_releases/worked_example1/tender.json index 25da464f5..13d011e8d 100644 --- a/docs/examples/easy_releases/worked_example1/tender.json +++ b/docs/examples/easy_releases/worked_example1/tender.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-01T09:00:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-01T09:00:00Z", diff --git a/docs/examples/easy_releases/worked_example1/tender_update.json b/docs/examples/easy_releases/worked_example1/tender_update.json index 01138cef9..1b5702cfd 100644 --- a/docs/examples/easy_releases/worked_example1/tender_update.json +++ b/docs/examples/easy_releases/worked_example1/tender_update.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-04T09:00:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-03T09:00:00Z", diff --git a/docs/examples/easy_releases/worked_example2/award.json b/docs/examples/easy_releases/worked_example2/award.json index 4f66308a0..53c7da677 100644 --- a/docs/examples/easy_releases/worked_example2/award.json +++ b/docs/examples/easy_releases/worked_example2/award.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-27T14:42:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-27T14:42:00Z", diff --git a/docs/examples/easy_releases/worked_example2/contract.json b/docs/examples/easy_releases/worked_example2/contract.json index aa1b5b515..80e0e54f8 100644 --- a/docs/examples/easy_releases/worked_example2/contract.json +++ b/docs/examples/easy_releases/worked_example2/contract.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2020-01-11T07:53:50Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2020-01-11T07:53:50Z", diff --git a/docs/examples/easy_releases/worked_example2/tender.json b/docs/examples/easy_releases/worked_example2/tender.json index aaae0a508..c4fd648d0 100644 --- a/docs/examples/easy_releases/worked_example2/tender.json +++ b/docs/examples/easy_releases/worked_example2/tender.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-01T09:00:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-01T09:00:00Z", diff --git a/docs/examples/easy_releases/worked_example2/tender_update.json b/docs/examples/easy_releases/worked_example2/tender_update.json index 34cbddb95..44d10f83a 100644 --- a/docs/examples/easy_releases/worked_example2/tender_update.json +++ b/docs/examples/easy_releases/worked_example2/tender_update.json @@ -1,15 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/", "version": "1.1", - "publisher": { - "uid": "80048717-6", - "name": "Direccion Nacional de Contrataciones Públicas", - "scheme": "PY-RUC", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2019-12-04T09:00:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "releases": [ { "date": "2019-12-04T09:00:00Z", diff --git a/docs/examples/frameworks/closed_single_award.json b/docs/examples/frameworks/closed_single_award.json index 6dfa565d7..39061c6ec 100644 --- a/docs/examples/frameworks/closed_single_award.json +++ b/docs/examples/frameworks/closed_single_award.json @@ -1,12 +1,5 @@ { - "uri": "https://example.com/ocds/ocds-r6ebe6-95f19d21-d066-4931-a431-071211033960/1", "version": "1.1", - "publishedDate": "2019-03-01T16:30:52Z", - "publisher": { - "name": "Open Contracting Partnership" - }, - "license": "https://creativecommons.org/publicdomain/zero/1.0/", - "publicationPolicy": "http://example.com/publicationPolicy", "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_competitive_extension/master/extension.json" ], diff --git a/docs/examples/frameworks/closed_single_first_stage.json b/docs/examples/frameworks/closed_single_first_stage.json index 4828a92b8..feae5766d 100644 --- a/docs/examples/frameworks/closed_single_first_stage.json +++ b/docs/examples/frameworks/closed_single_first_stage.json @@ -1,12 +1,5 @@ { - "uri": "https://example.com/ocds/ocds-r6ebe6-9af22e2f-5307-4e98-bff6-1ebffbff343d/2019_S197-478648", "version": "1.1", - "publishedDate": "2019-10-09T00:00:00Z", - "publisher": { - "name": "Open Contracting Partnership" - }, - "license": "https://creativecommons.org/publicdomain/zero/1.0/", - "publicationPolicy": "http://example.com/publicationPolicy", "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_techniques_extension/master/extension.json" ], diff --git a/docs/examples/frameworks/closed_single_supplier.json b/docs/examples/frameworks/closed_single_supplier.json index ef6bc31dc..c5640ee13 100644 --- a/docs/examples/frameworks/closed_single_supplier.json +++ b/docs/examples/frameworks/closed_single_supplier.json @@ -1,12 +1,5 @@ { - "uri": "https://example.com/ocds/ocds-r6ebe6-9af22e2f-5307-4e98-bff6-1ebffbff343d/2020_S110-268595", "version": "1.1", - "publishedDate": "2020-06-05T00:00:00Z", - "publisher": { - "name": "Open Contracting Partnership" - }, - "license": "https://creativecommons.org/publicdomain/zero/1.0/", - "publicationPolicy": "http://example.com/publicationPolicy", "releases": [ { "ocid": "ocds-r6ebe6-9af22e2f-5307-4e98-bff6-1ebffbff343d", diff --git a/docs/examples/frameworks/open_multiple_award.json b/docs/examples/frameworks/open_multiple_award.json index 3eb6ad1c0..c2de97db4 100644 --- a/docs/examples/frameworks/open_multiple_award.json +++ b/docs/examples/frameworks/open_multiple_award.json @@ -1,10 +1,5 @@ { - "uri": "https://apis.mercadopublico.cl/OCDS/data/contract/54705", "version": "1.1", - "publishedDate": "2020-02-04T16:30:52Z", - "publisher": { - "name": "Dirección de Compras y Contratación Pública" - }, "releases": [ { "ocid": "ocds-70d2nz-54705", diff --git a/docs/examples/frameworks/open_multiple_first_stage.json b/docs/examples/frameworks/open_multiple_first_stage.json index 2c13a02f4..d8600a5f6 100644 --- a/docs/examples/frameworks/open_multiple_first_stage.json +++ b/docs/examples/frameworks/open_multiple_first_stage.json @@ -1,10 +1,5 @@ { - "uri": "https://apis.mercadopublico.cl/OCDS/data/tender/2239-4-LP14", "version": "1.1", - "publishedDate": "2020-02-04T16:30:52Z", - "publisher": { - "name": "Dirección de Compras y Contratación Pública" - }, "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_techniques_extension/master/extension.json" ], diff --git a/docs/examples/frameworks/open_multiple_second_stage.json b/docs/examples/frameworks/open_multiple_second_stage.json index 62adbc10f..505051ce4 100644 --- a/docs/examples/frameworks/open_multiple_second_stage.json +++ b/docs/examples/frameworks/open_multiple_second_stage.json @@ -1,10 +1,5 @@ { - "uri": "https://apis.mercadopublico.cl/OCDS/data/tender/54705", "version": "1.1", - "publishedDate": "2020-02-04T16:30:52Z", - "publisher": { - "name": "Dirección de Compras y Contratación Pública" - }, "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_competitive_extension/master/extension.json" ], diff --git a/docs/examples/frameworks/open_multiple_supplier.json b/docs/examples/frameworks/open_multiple_supplier.json index 0805acd73..711cebf6c 100644 --- a/docs/examples/frameworks/open_multiple_supplier.json +++ b/docs/examples/frameworks/open_multiple_supplier.json @@ -1,10 +1,5 @@ { - "uri": "https://apis.mercadopublico.cl/OCDS/data/award/2239-4-LP14", "version": "1.1", - "publishedDate": "2020-02-04T16:33:32Z", - "publisher": { - "name": "Dirección de Compras y Contratación Pública" - }, "releases": [ { "ocid": "ocds-70d2nz-2239-4-LP14", diff --git a/docs/examples/merging/deletions/array_award.json b/docs/examples/merging/deletions/array_award.json index 5e2335118..618ad5a93 100644 --- a/docs/examples/merging/deletions/array_award.json +++ b/docs/examples/merging/deletions/array_award.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-23g63a01-200502-award.json", - "publisher": { - "name": "Zambia Public Procurement Authority" - }, - "publishedDate": "2018-12-31T23:00:00Z", "version": "1.1", "releases": [ { diff --git a/docs/examples/merging/deletions/array_awardAmendment.json b/docs/examples/merging/deletions/array_awardAmendment.json index 7c6ad65ed..09f935716 100644 --- a/docs/examples/merging/deletions/array_awardAmendment.json +++ b/docs/examples/merging/deletions/array_awardAmendment.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-23g63a01-200502-awardAmendment.json", - "publisher": { - "name": "Zambia Public Procurement Authority" - }, - "publishedDate": "2019-01-21T09:00:00Z", "version": "1.1", "releases": [ { diff --git a/docs/examples/merging/deletions/array_record.json b/docs/examples/merging/deletions/array_record.json index 6f6911f8c..069427beb 100644 --- a/docs/examples/merging/deletions/array_record.json +++ b/docs/examples/merging/deletions/array_record.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-23g63a01-200502.json", - "publisher": { - "name": "Zambia Public Procurement Authority" - }, - "publishedDate": "", "version": "1.1", "records": [ { diff --git a/docs/examples/merging/deletions/field_record.json b/docs/examples/merging/deletions/field_record.json index 449179f2d..c8d70d05f 100644 --- a/docs/examples/merging/deletions/field_record.json +++ b/docs/examples/merging/deletions/field_record.json @@ -1,9 +1,4 @@ { - "uri": "", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "2013-07-30T09:00:10.000Z", "version": "1.1", "records": [ { diff --git a/docs/examples/merging/deletions/field_tender.json b/docs/examples/merging/deletions/field_tender.json index 6098a7cb2..93d2da939 100644 --- a/docs/examples/merging/deletions/field_tender.json +++ b/docs/examples/merging/deletions/field_tender.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-k50g02-13-9-368828-tender.json", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "2013-07-28T09:40:10.000Z", "version": "1.2", "releases": [ { diff --git a/docs/examples/merging/deletions/field_tenderUpdate.json b/docs/examples/merging/deletions/field_tenderUpdate.json index f3df37d94..a77c746f4 100644 --- a/docs/examples/merging/deletions/field_tenderUpdate.json +++ b/docs/examples/merging/deletions/field_tenderUpdate.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-k50g02-13-9-368828-tenderUpdate.json", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "2013-07-30T09:00:10.000Z", "version": "1.2", "releases": [ { diff --git a/docs/examples/merging/deletions/object_record.json b/docs/examples/merging/deletions/object_record.json index 07bca756b..232e13c13 100644 --- a/docs/examples/merging/deletions/object_record.json +++ b/docs/examples/merging/deletions/object_record.json @@ -1,9 +1,4 @@ { - "uri": "", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "", "version": "1.1", "records": [ { diff --git a/docs/examples/merging/deletions/object_tender.json b/docs/examples/merging/deletions/object_tender.json index a2ad7b2bd..f3b2ed967 100644 --- a/docs/examples/merging/deletions/object_tender.json +++ b/docs/examples/merging/deletions/object_tender.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-k50g02-11-13-651832-tender.json", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "2011-10-14T16:26:49.000Z", "version": "1.2", "releases": [ { diff --git a/docs/examples/merging/deletions/object_tenderAmendment.json b/docs/examples/merging/deletions/object_tenderAmendment.json index e856e4de8..7c2d5e92a 100644 --- a/docs/examples/merging/deletions/object_tenderAmendment.json +++ b/docs/examples/merging/deletions/object_tenderAmendment.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-k50g02-11-13-651832-tenderUpdate.json", - "publisher": { - "name": "Colombia Compra Eficiente" - }, - "publishedDate": "2011-10-18T08:54:21.000Z", "version": "1.2", "releases": [ { diff --git a/docs/examples/merging/embedded_releases.json b/docs/examples/merging/embedded_releases.json index 27a842174..bb930d37d 100644 --- a/docs/examples/merging/embedded_releases.json +++ b/docs/examples/merging/embedded_releases.json @@ -1,12 +1,5 @@ { "extensions": [], - "publishedDate": "2014-02-02T13:02:00Z", - "publisher": { - "name": "Open Data Services Co-operative Limited", - "scheme": "GB-COH", - "uid": "09506232", - "uri": "https://standard.open-contracting.org/examples/" - }, "records": [ { "compiledRelease": { @@ -1533,6 +1526,5 @@ ] } ], - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00001.json", "version": "1.1" } diff --git a/docs/examples/merging/updates/award1.json b/docs/examples/merging/updates/award1.json index b55f39d47..6c94c1d8f 100644 --- a/docs/examples/merging/updates/award1.json +++ b/docs/examples/merging/updates/award1.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json", - "publishedDate": "2016-03-01T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/merging/updates/award2.json b/docs/examples/merging/updates/award2.json index 387707917..aa5db86b2 100644 --- a/docs/examples/merging/updates/award2.json +++ b/docs/examples/merging/updates/award2.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json", - "publishedDate": "2016-03-03T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/merging/updates/merged.json b/docs/examples/merging/updates/merged.json index 7dc1aaf35..ad48e1095 100644 --- a/docs/examples/merging/updates/merged.json +++ b/docs/examples/merging/updates/merged.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002-merge.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2016-03-05T13:02:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/merging/updates/tender1.json b/docs/examples/merging/updates/tender1.json index 18bf6a90d..9ae8a1406 100644 --- a/docs/examples/merging/updates/tender1.json +++ b/docs/examples/merging/updates/tender1.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json", - "publishedDate": "2016-01-01T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/merging/updates/tender2.json b/docs/examples/merging/updates/tender2.json index f955d9afe..cc9f44348 100644 --- a/docs/examples/merging/updates/tender2.json +++ b/docs/examples/merging/updates/tender2.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json", - "publishedDate": "2016-01-31T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/merging/updates/tender3.json b/docs/examples/merging/updates/tender3.json index b149e4660..cb598e723 100644 --- a/docs/examples/merging/updates/tender3.json +++ b/docs/examples/merging/updates/tender3.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json", - "publishedDate": "2016-02-05T10:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json index bf92051b0..4d686b7ea 100644 --- a/docs/examples/merging/updates/versioned.json +++ b/docs/examples/merging/updates/versioned.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/records/ocds-213czf-000-00002-merge.json", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "publishedDate": "2016-03-05T13:02:00Z", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "records": [ { diff --git a/docs/examples/milestones/implementation_financial_milestones_not_met.json b/docs/examples/milestones/implementation_financial_milestones_not_met.json index 993eadfb3..e97475d47 100644 --- a/docs/examples/milestones/implementation_financial_milestones_not_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_not_met.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-afalqw-001-5c10b8c57e0a947f6b212f58-001", - "publisher": { - "name": "National Procurement Authority, Afghanistan" - }, - "publishedDate": "2018-09-21T08:00:00+04:30", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/implementation_financial_milestones_partially_met.json b/docs/examples/milestones/implementation_financial_milestones_partially_met.json index c2d69cac7..9618258c4 100644 --- a/docs/examples/milestones/implementation_financial_milestones_partially_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_partially_met.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-afalqw-001-5c10b8c57e0a947f6b212f58-002", - "publisher": { - "name": "National Procurement Authority, Afghanistan" - }, - "publishedDate": "2018-10-06T11:59:09+04:30", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/implementation_financial_milestones_transaction.json b/docs/examples/milestones/implementation_financial_milestones_transaction.json index 3baefc8bd..51f131c70 100644 --- a/docs/examples/milestones/implementation_financial_milestones_transaction.json +++ b/docs/examples/milestones/implementation_financial_milestones_transaction.json @@ -1,9 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-afalqw-001-5c10b8c57e0a947f6b212f58-003", - "publisher": { - "name": "National Procurement Authority, Afghanistan" - }, - "publishedDate": "2018-10-10T16:48:09+04:30", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/implementation_milestones_met.json b/docs/examples/milestones/implementation_milestones_met.json index 888ec2f2c..e21079de7 100644 --- a/docs/examples/milestones/implementation_milestones_met.json +++ b/docs/examples/milestones/implementation_milestones_met.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json", - "publishedDate": "2011-01-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/implementation_milestones_partially_met.json b/docs/examples/milestones/implementation_milestones_partially_met.json index 883329c77..de02e4f41 100644 --- a/docs/examples/milestones/implementation_milestones_partially_met.json +++ b/docs/examples/milestones/implementation_milestones_partially_met.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json", - "publishedDate": "2011-01-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/milestones/implementation_milestones_scheduled.json b/docs/examples/milestones/implementation_milestones_scheduled.json index e86a47622..db4fe3696 100644 --- a/docs/examples/milestones/implementation_milestones_scheduled.json +++ b/docs/examples/milestones/implementation_milestones_scheduled.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json", - "publishedDate": "2011-01-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/planning-tender-milestones-2.json b/docs/examples/milestones/planning-tender-milestones-2.json index 4f42ab071..8713937fa 100644 --- a/docs/examples/milestones/planning-tender-milestones-2.json +++ b/docs/examples/milestones/planning-tender-milestones-2.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-tender.json", - "publishedDate": "2016-10-23T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "releases": [ { diff --git a/docs/examples/milestones/planning_milestone.json b/docs/examples/milestones/planning_milestone.json index fd304041d..003af1503 100644 --- a/docs/examples/milestones/planning_milestone.json +++ b/docs/examples/milestones/planning_milestone.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-planning.json", - "publishedDate": "2016-09-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "releases": [ { diff --git a/docs/examples/organizations/identifiers.json b/docs/examples/organizations/identifiers.json index dbcdc8817..e6dcc29a5 100644 --- a/docs/examples/organizations/identifiers.json +++ b/docs/examples/organizations/identifiers.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json", - "publishedDate": "2010-05-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json index 8f929118a..f0ffe7b8b 100644 --- a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json +++ b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json @@ -1,13 +1,8 @@ { - "publishedDate": "2019-04-01T17:08:14+05:45", - "publisher": { - "name": "Public Procurement Monitoring Office" - }, "extensions": [ "https://raw.githubusercontent.com/publisher/ocds_femaleChaired_extension/v1.0/extension.json" ], "version": "1.1", - "uri": "https://standard.open-contracting.org/examples/release/ocds-213czf-IMS/1160", "releases": [ { "ocid": "ocds-213czf-IMS/1160", diff --git a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json index a7b1b1009..92b7fd7ae 100644 --- a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json +++ b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json @@ -1,15 +1,8 @@ { - "publishedDate": "2020-02-01T17:10:14+05:45", - "publisher": { - "name": "Ciudad Ficticia" - }, "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_organizationClassification_extension/master/extension.json" ], "version": "1.1", - "uri": "https://standard.open-contracting.org/examples/release/ocds-213czf-col-cf/1111", - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/fictional_publication_policy_url", "releases": [ { "ocid": "ocds-213czf-col-cf/1111", diff --git a/docs/examples/organizations/organization_classification/moldova_organization_scale.json b/docs/examples/organizations/organization_classification/moldova_organization_scale.json index 226727b92..8533b91fe 100644 --- a/docs/examples/organizations/organization_classification/moldova_organization_scale.json +++ b/docs/examples/organizations/organization_classification/moldova_organization_scale.json @@ -1,12 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-b3wdp1-MD-1554728148250-EV-1555051169779", "version": "1.1", - "publisher": { - "name": "M-Tender" - }, - "license": "http://opendefinition.org/licenses/", - "publicationPolicy": "https://standard.open-contracting.org/examples/publicationPolicy/", - "publishedDate": "2019-04-08T12:55:48Z", "releases": [ { "ocid": "ocds-b3wdp1-MD-1554728148222-EV-1555", diff --git a/docs/examples/organizations/organization_classification/uk_organization_classification.json b/docs/examples/organizations/organization_classification/uk_organization_classification.json index 8e594e43f..e080d6a92 100644 --- a/docs/examples/organizations/organization_classification/uk_organization_classification.json +++ b/docs/examples/organizations/organization_classification/uk_organization_classification.json @@ -1,13 +1,8 @@ { - "publishedDate": "2019-04-01T17:08:14+05:45", - "publisher": { - "name": "Public Procurement Monitoring Office" - }, "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_organizationClassification_extension/master/extension.json" ], "version": "1.1", - "uri": "https://standard.open-contracting.org/examples/release/ocds-213czf-IMS/1160", "releases": [ { "ocid": "ocds-h6vhtk-016248", diff --git a/docs/examples/organizations/organization_reference.json b/docs/examples/organizations/organization_reference.json index 58c7b6b91..c06123e08 100644 --- a/docs/examples/organizations/organization_reference.json +++ b/docs/examples/organizations/organization_reference.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json", - "publishedDate": "2010-05-10T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json b/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json index 46dd96889..d121091e0 100644 --- a/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json +++ b/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json @@ -1,12 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-lcuori-4LOxWG-139-2011-1", "version": "1.1", - "publishedDate": "2011-02-23T12:59:31.133000-06:00", - "publisher": { - "name": "Oficina Normativa de Contratación y Adquisiciones del Estado (ONCAE) / Honduras" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://www.contrataciones.gov.py/datos/legal", "releases": [ { "date": "2011-02-23T12:59:31.133000-06:00", diff --git a/docs/examples/organizations/organizational_units/moldova_organization_extension.json b/docs/examples/organizations/organizational_units/moldova_organization_extension.json index bc662e03b..bf8b52d57 100644 --- a/docs/examples/organizations/organizational_units/moldova_organization_extension.json +++ b/docs/examples/organizations/organizational_units/moldova_organization_extension.json @@ -1,16 +1,9 @@ { - "uri": "https://standard.open-contracting.org/release/ocds-b3wdp1-MD-1539840280133-1539840280205", "version": "1.1", "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_budget_breakdown_extension/master/extension.json", "https://standard.open-contracting.org/examples/extensions/ocds_divisionCode_extension/extension.json" ], - "publisher": { - "name": "M-Tender" - }, - "license": "http://opendefinition.org/licenses/", - "publicationPolicy": "https://standard.open-contracting.org/examples/publicationPolicy/", - "publishedDate": "2018-10-18T05:24:39Z", "releases": [ { "ocid": "ocds-b3wdp1-MD-1539840280133", diff --git a/docs/examples/organizations/organizational_units/paraguay_organization_name.json b/docs/examples/organizations/organizational_units/paraguay_organization_name.json index 67a704f5e..8354c7388 100644 --- a/docs/examples/organizations/organizational_units/paraguay_organization_name.json +++ b/docs/examples/organizations/organizational_units/paraguay_organization_name.json @@ -1,11 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/release/ocds-03ad3f-373449-1/1", - "publishedDate": "2019-12-05T12:36:58-04:00", - "publisher": { - "name": "Dirección Nacional de Contrataciones Públicas, Paraguay" - }, - "license": "https://creativecommons.org/licenses/by/4.0/", - "publicationPolicy": "https://standard.open-contracting.org/examples/publicationPolicy/", "version": "1.1", "releases": [ { diff --git a/docs/examples/organizations/personal_identifier.json b/docs/examples/organizations/personal_identifier.json index 98b07fbde..dfd3a15ba 100644 --- a/docs/examples/organizations/personal_identifier.json +++ b/docs/examples/organizations/personal_identifier.json @@ -1,14 +1,4 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json", - "publishedDate": "2010-03-01T09:30:00Z", - "publisher": { - "scheme": "GB-COH", - "uid": "09506232", - "name": "Open Data Services Co-operative Limited", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "http://opendatacommons.org/licenses/pddl/1.0/", - "publicationPolicy": "https://github.com/open-contracting/sample-data/", "version": "1.1", "extensions": [], "releases": [ diff --git a/docs/examples/pre-qualification/pre-qualification_paraguay.json b/docs/examples/pre-qualification/pre-qualification_paraguay.json index dcdcaf81e..0524d042d 100644 --- a/docs/examples/pre-qualification/pre-qualification_paraguay.json +++ b/docs/examples/pre-qualification/pre-qualification_paraguay.json @@ -1,9 +1,4 @@ { - "uri": "http://example.com", - "publisher": { - "name": "Open Data Services Co-operative Ltd" - }, - "publishedDate": "2017-06-14T00:00:00-04:00", "version": "1.1", "releases": [ { diff --git a/docs/examples/pre-qualification/pre-qualification_tender.json b/docs/examples/pre-qualification/pre-qualification_tender.json index 10a003d2b..8dc90a955 100644 --- a/docs/examples/pre-qualification/pre-qualification_tender.json +++ b/docs/examples/pre-qualification/pre-qualification_tender.json @@ -1,9 +1,4 @@ { - "uri": "http://example.com", - "publisher": { - "name": "Open Data Services Co-operative Ltd" - }, - "publishedDate": "2019-02-22T00:00:00Z", "version": "1.1", "releases": [ { diff --git a/docs/examples/pre-qualification/pre-selection_tender.json b/docs/examples/pre-qualification/pre-selection_tender.json index db53643b7..e77762018 100644 --- a/docs/examples/pre-qualification/pre-selection_tender.json +++ b/docs/examples/pre-qualification/pre-selection_tender.json @@ -1,9 +1,4 @@ { - "uri": "http://example.com", - "publisher": { - "name": "Open Data Services Co-operative Ltd" - }, - "publishedDate": "2020-01-17T00:00:00Z", "version": "1.1", "extensions": [ "https://raw.githubusercontent.com/open-contracting-extensions/ocds_selectionCriteria_extension/master/extension.json" diff --git a/docs/examples/release_schema_reference/release_package.json b/docs/examples/release_schema_reference/release_package.json index b9d97a0d7..1794e2bc2 100644 --- a/docs/examples/release_schema_reference/release_package.json +++ b/docs/examples/release_schema_reference/release_package.json @@ -1,7 +1,5 @@ { - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001.json", "version": "1.1", - "publishedDate": "2014-02-02T13:02:00Z", "releases": [ { "ocid": "ocds-213czf-000-00001", @@ -426,13 +424,5 @@ } ] } - ], - "publisher": { - "name": "Open Data Services Co-operative Limited", - "scheme": "GB-COH", - "uid": "09506232", - "uri": "https://standard.open-contracting.org/examples/" - }, - "license": "https://creativecommons.org/licenses/by/4.0/", - "publicationPolicy": "http://www.example.com/publication-policy" + ] } diff --git a/docs/examples/unsuccessful_tender/planning.json b/docs/examples/unsuccessful_tender/planning.json index a67abd0ff..d0316aa4a 100644 --- a/docs/examples/unsuccessful_tender/planning.json +++ b/docs/examples/unsuccessful_tender/planning.json @@ -1,11 +1,4 @@ { - "uri": "https://www.contrataciones.gov.py/datos/api/v3/doc/ocds/releases/id/331547-servicio-rastreo-satelital-1-1511346066", - "publishedDate": "2020-03-23T15:44:33Z", - "publisher": { - "name": "Dirección Nacional de Contrataciones Públicas, Paraguay" - }, - "license": "https://creativecommons.org/licenses/by/4.0/", - "publicationPolicy": "https://www.contrataciones.gov.py/datos/legal", "version": "1.1", "releases": [ { diff --git a/docs/examples/unsuccessful_tender/related_process.json b/docs/examples/unsuccessful_tender/related_process.json index 49a2b0807..96842d7c6 100644 --- a/docs/examples/unsuccessful_tender/related_process.json +++ b/docs/examples/unsuccessful_tender/related_process.json @@ -1,11 +1,4 @@ { - "uri": "https://www.contrataciones.gov.py/datos/api/v3/doc/ocds/releases/id/331547-adquisicion-maquinaria-implemento-vehiculo-3-1511346066", - "publishedDate": "2020-03-23T17:15:00Z", - "publisher": { - "name": "Dirección Nacional de Contrataciones Públicas, Paraguay" - }, - "license": "https://creativecommons.org/licenses/by/4.0/", - "publicationPolicy": "https://www.contrataciones.gov.py/datos/legal", "version": "1.1", "releases": [ { diff --git a/docs/examples/unsuccessful_tender/tender.json b/docs/examples/unsuccessful_tender/tender.json index aace26b83..05a676983 100644 --- a/docs/examples/unsuccessful_tender/tender.json +++ b/docs/examples/unsuccessful_tender/tender.json @@ -1,11 +1,4 @@ { - "uri": "https://www.contrataciones.gov.py/datos/api/v3/doc/ocds/releases/id/331547-servicio-rastreo-satelital-1-1511346066", - "publishedDate": "2020-03-23T17:01:05Z", - "publisher": { - "name": "Dirección Nacional de Contrataciones Públicas, Paraguay" - }, - "license": "https://creativecommons.org/licenses/by/4.0/", - "publicationPolicy": "https://www.contrataciones.gov.py/datos/legal", "version": "1.1", "releases": [ { diff --git a/docs/guidance/build.md b/docs/guidance/build.md index 1743ceb38..c36d44c1b 100644 --- a/docs/guidance/build.md +++ b/docs/guidance/build.md @@ -100,8 +100,8 @@ If you have any issues using OCDS tools, contact the [Data Support Team](../../s * If your source data is in **Excel files**, you can alternately transform Excel files to OCDS JSON by using the [Open Contracting Explorer](https://developmentgateway.org/expertise/open-contracting-procurement/), which includes a web interface and web API for users to access and explore the OCDS data. (This tool is authored by Development Gateway.) * If your source data is in **SQL tables**, you can use [Kavure'i](https://gitlab.com/dncp-opendata/opendata-etl/-/blob/master/README_en.md) to transform it to OCDS. To use it, you write SQL queries to extract data from SQL tables, setting the columns for the query results to match the JSON paths in OCDS (for example, `buyer/name`). The query results are saved to CSV files, which are transformed to OCDS JSON using [Flatten Tool](https://flatten-tool.readthedocs.io/en/latest/usage-ocds/). (Kavure'i is authored by Paraguay's Dirección Nacional de Contrataciones Públicas (DNCP).) * To **make OCDS data available via an API**, you can use another component of [Kavure'i](https://gitlab.com/dncp-opendata/opendata-etl/-/blob/master/README_en.md) to load OCDS data into [ElasticSearch](https://www.elastic.co/), and then use [Pitogüé](https://gitlab.com/dncp-opendata/opendata-api-v3/blob/master/README_en.md) to make it available via an API. (Both tools are authored by Paraguay's Dirección Nacional de Contrataciones Públicas (DNCP).) -* If you intend to **publish [record packages](../../schema/record_package)**, [OCDS Merge](https://ocds-merge.readthedocs.io/en/latest/) is the best software library for creating OCDS [records](../../primer/releases_and_records). If you use the [Python](https://www.python.org/) programming language, you can use it directly. If not, you can use its [test cases](https://ocds-merge.readthedocs.io/en/latest/#test-cases) to test your implementation of the [merge routine](../../schema/merging), and you can read its [commented code](https://github.com/open-contracting/ocds-merge) as inspiration for your implementation. -* If you have [release packages](../../schema/release_package) and want to have [record packages](../../schema/record_package), if you have data that follows an older version of OCDS, or if you otherwise need to transform your OCDS data, you can use [OCDS Kit](https://ocdskit.readthedocs.io/en/latest/) as a command-line tool or [Python](https://www.python.org/) library. +* If you intend to **publish [record packages](../../schema/packaging/record_package)**, [OCDS Merge](https://ocds-merge.readthedocs.io/en/latest/) is the best software library for creating OCDS [records](../../primer/releases_and_records). If you use the [Python](https://www.python.org/) programming language, you can use it directly. If not, you can use its [test cases](https://ocds-merge.readthedocs.io/en/latest/#test-cases) to test your implementation of the [merge routine](../../schema/merging), and you can read its [commented code](https://github.com/open-contracting/ocds-merge) as inspiration for your implementation. +* If you have [release packages](../../schema/packaging/release_package) and want to have [record packages](../../schema/packaging/record_package), if you have data that follows an older version of OCDS, or if you otherwise need to transform your OCDS data, you can use [OCDS Kit](https://ocdskit.readthedocs.io/en/latest/) as a command-line tool or [Python](https://www.python.org/) library. If you aren't creating or updating an IT system, but are instead reusing an existing [data collection tool](build/data_collection_tools), you can customize it: diff --git a/docs/guidance/build/easy_releases.md b/docs/guidance/build/easy_releases.md index 36ea28deb..ccd2065ee 100644 --- a/docs/guidance/build/easy_releases.md +++ b/docs/guidance/build/easy_releases.md @@ -21,7 +21,7 @@ These approaches can be useful for most situations but they are not meant to be ### Packaging -Releases in OCDS need to be packaged using a [release package](../../schema/release_package). This is to provide consistency and important metadata. +Releases in OCDS need to be packaged using a [release package](../../schema/packaging/release_package). This is to provide consistency and important metadata. In an 'Easy' releases scenario it is still necessary to package data. Therefore the release needs to be wrapped in a *release package*. It is *not* appropriate to use an OCDS record to contain the release because `record.releases` is a list of all the releases and not just the latest one. diff --git a/docs/guidance/build/hosting.md b/docs/guidance/build/hosting.md index a81ac844b..6f229ff04 100644 --- a/docs/guidance/build/hosting.md +++ b/docs/guidance/build/hosting.md @@ -19,7 +19,7 @@ To meet the [basic criteria for data quality](../publish/quality.md#basic-criter ## Bulk downloads -The [release package](../../schema/release_package) and [record package](../../schema/record_package) can provide **bulk access** to releases and records, respectively. +The [release package](../../schema/packaging/release_package) and [record package](../../schema/packaging/record_package) can provide **bulk access** to releases and records, respectively. However, very large files can be difficult for users to download and process. The following section suggests good practices to assist users in accessing data. These are not requirements of the standard, but are based on experiences of maximizing the number of users able to work with datasets with their existing hardware and software. diff --git a/docs/guidance/build/serialization.md b/docs/guidance/build/serialization.md index 2ab25a3c4..64d2492b3 100644 --- a/docs/guidance/build/serialization.md +++ b/docs/guidance/build/serialization.md @@ -95,9 +95,3 @@ Multiple tables can be packaged together as the tabs of an Excel spreadsheet, or An example multi-table template can be found [in the sample data repository](https://github.com/open-contracting/sample-data/tree/main/flat-template). For further information on multi-table serializations please see the [flatten tool documentation](https://flatten-tool.readthedocs.io/en/latest/). - -## Packaging files with metadata - -Whatever serialization is used for Open Contracting Data, a single file can contain one or more release and records. - -The release package and record package schemas describe the key metadata that ought to be supplied for any file providing Open Contracting Data. This includes the `publishedDate`, `publisher`, `uri` for accessing the file, and the licensing details for the file. diff --git a/docs/guidance/publish.md b/docs/guidance/publish.md index 6492f6af6..c5f94f742 100644 --- a/docs/guidance/publish.md +++ b/docs/guidance/publish.md @@ -45,20 +45,7 @@ We encourage the use of either a public domain dedication/certification, or an a When using custom licenses, publishers are encouraged to check that they are [compliant with the Open Definition](https://opendefinition.org/licenses/). -In structured data file you ought to embed a link to the license in the `license` field of the release or record package as indicated below: - -```{code-block} json -:emphasize-lines: 4 - -{ - "uri": "https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json", - "publishedDate": "2010-03-01T09:30:00Z", - "license": "https://opendatacommons.org/licenses/pddl/1-0/", - "...": "..." -} -``` - -In individual CSV files or other models of publishing, it might not be possible to embed the license information. In these cases (and in the structured data case also) publishers ought to ensure that a clear statement is provided alongside files where they are provided for download linking to, and explaining, the license terms they are published under. Particular attention ought to be paid to ensuring license information on any data catalogues where open contracting data is listed are accurate. +Where data is provided for download, publishers ought to clearly link to, and explain, the terms of the license under which the data is published. In any listing of the dataset (for example, in a data catalog), publishers ought to ensure that license information is provided and accurate. ## Publish and share your data diff --git a/docs/history/changelog.md b/docs/history/changelog.md index aca703a46..8d7e16679 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -246,11 +246,27 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1339](https://github.com/open-contracting/standard/pull/1339) Deprecate `packages`. * [#1374](https://github.com/open-contracting/standard/pull/1374) Remove `records.minItems` requirement. * [#1393](https://github.com/open-contracting/standard/pull/1393) Remove `releases` as a required field of the `Record` object. - * [#1422](https://github.com/open-contracting/standard/pull/1422) Add `links` to support pagination. + * [#1640](https://github.com/open-contracting/standard/pull/1640): + * Refactor to move the `Record` definition to its own schema. + * Disallow use of `null` in the required `url` field of a `LinkedRelease` object. + * Records are no longer required to be unique. + * Deprecate fields and objects: + * `uri` + * `publisher` + * `license` + * `publicationPolicy` + * `publishedDate` * Release package schema: * [#1374](https://github.com/open-contracting/standard/pull/1374) Remove `releases.minItems` requirement. - * [#1422](https://github.com/open-contracting/standard/pull/1422) Add `links` to support pagination. + * [#1640](https://github.com/open-contracting/standard/pull/1640): + * Releases are no longer required to be unique. + * Deprecate fields and objects: + * `uri` + * `publisher` + * `license` + * `publicationPolicy` + * `publishedDate` * Improve the clarity of field descriptions in the release package schema and record package schema: * [#1067](https://github.com/open-contracting/standard/pull/1067) `Publisher.name`, to indicate that it is the organization or department responsible for publishing the OCDS version of the data. @@ -446,7 +462,7 @@ See the changelogs for: ### Schema * [#251](https://github.com/open-contracting/standard/issues/251) Allow optional field `parties.role` to be `null`. -* [#479](https://github.com/open-contracting/standard/issues/479) Remove `releases` as a required field in [`record-package-schema.json`](../schema/record_package). +* [#479](https://github.com/open-contracting/standard/issues/479) Remove `releases` as a required field in [`record-package-schema.json`](../schema/packaging/record_package). * [#475](https://github.com/open-contracting/standard/issues/475) Add an `enum` property to every field in the schema with a closed codelist. ### Codelists @@ -483,7 +499,7 @@ See the changelogs for: * [#323](https://github.com/open-contracting/standard/issues/323) **[Standard should specify use of UTF-8 for encoding JSON](../guidance/build/serialization.md#json)** - We now recommend use of I-JSON and UTF-8 for JSON publication * [#166](https://github.com/open-contracting/standard/issues/166) **[Indicate encoding for CSV serializations](../guidance/build/serialization.md#multi-table)** - We have added information on CSV encoding to the implementation guidance to recommend UTF-8 or Windows-1252. * [#336](https://github.com/open-contracting/standard/issues/336) **[Codelist properties in schema](https://github.com/open-contracting/standard/commit/ee1db256d7364ee70e3553f4384d9908bff604a6)** - We have included explicit references to the codelist files (CSV versions) in the schema. This will be used in future versions of the validator to support validation against codelists. -* [#301](https://github.com/open-contracting/standard/issues/301) **[Specifying versions and extensions in package metadata](../schema/records_reference.md#package-metadata)** - We have updated the package schemas to require that version is declared, and to provide a means of declaring extensions in use. This will be used in future versions of the validator to support validation against extensions. +* [#301](https://github.com/open-contracting/standard/issues/301) **[Specifying versions and extensions in package metadata](../schema/packaging/index)** - We have updated the package schemas to require that version is declared, and to provide a means of declaring extensions in use. This will be used in future versions of the validator to support validation against extensions. * [#287](https://github.com/open-contracting/standard/issues/287) [#447](https://github.com/open-contracting/standard/pull/447) **[Change how merge strategies are expressed](../schema/merging)** - The `omitWhenMerged` and `wholeListMerge` properties replace the `mergeStrategy` and `mergeOptions` properties, with different semantics. * [#431](https://github.com/open-contracting/standard/pull/431) **Add `minLength` property to required string fields**. diff --git a/docs/schema/index.md b/docs/schema/index.md index d81ee5e6d..bee616bb8 100644 --- a/docs/schema/index.md +++ b/docs/schema/index.md @@ -2,7 +2,7 @@ The Open Contracting Data Standard is maintained using JSON Schema. -In this section you will find the schema for [releases](release) along with the schemas for [release packages](release_package) and [record packages](record_package), which act as envelopes for releases and records, respectively. +In this section you will find the schemas for [releases](release) and [records](record) along with the schemas for [packaging](packaging/index.md), which act as envelopes for releases and records. The [release schema reference](reference) provides guidance on using each of the [sections](reference.md#release-structure) and [building blocks](reference.md#building-block-reference) in the schema, and the [record schema reference](records_reference) provides additional information on publishing records with compiled and versioned releases. @@ -13,9 +13,9 @@ OCDS data must follow the I-JSON (Internet JSON) specification in [RFC7493](http reference release -release_package records_reference -record_package +record +packaging/index merging identifiers codelists diff --git a/docs/schema/packaging/index.md b/docs/schema/packaging/index.md new file mode 100644 index 000000000..689b66a51 --- /dev/null +++ b/docs/schema/packaging/index.md @@ -0,0 +1,10 @@ +# Packaging + +This section describes the schema for [release packages](release_package) and [record packages](record_package), which act as envelopes for releases and records, respectively. + +```{toctree} +:hidden: + +release_package +record_package +``` diff --git a/docs/schema/packaging/record_package.md b/docs/schema/packaging/record_package.md new file mode 100644 index 000000000..d4b536b25 --- /dev/null +++ b/docs/schema/packaging/record_package.md @@ -0,0 +1,34 @@ +# Record Package Schema + +The record package schema describes a container for records. + +````{admonition} Example +:class: hint + +```{jsoninclude} ../../examples/merging/updates/versioned.json +:jsonpointer: +:title: Record package +``` +```` + +For this version of OCDS, the canonical URL for the record package schema is . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. + +In addition to publishing the metadata described by the record package schema, you ought to license your data and guide data users. For more information, see the [licensing](../../guidance/publish.md#license-your-data) and [publication policy](../../guidance/publish.md#finalize-your-publication-policy) guidance. + +```{admonition} Browsing the schema +:class: note + +This page presents the record package schema in an interactive browser and in a table. You can also download the canonical version of the record package schema as [JSON Schema](../../../build/current_lang/record-package-schema.json). +``` + +## Schema browser + +Click on schema elements to expand the tree, or use the '+' icon to expand all elements. Use { } to view the underlying schema for any section. Required fields are indicated in **bold**. [Deprecated fields](../../governance/deprecation) and [multilingual fields](../reference.md#language) are omitted. + + + +## Reference table + +```{jsonschema} ../../../build/current_lang/record-package-schema.json +:collapse: records +``` diff --git a/docs/schema/packaging/release_package.md b/docs/schema/packaging/release_package.md new file mode 100644 index 000000000..60031655f --- /dev/null +++ b/docs/schema/packaging/release_package.md @@ -0,0 +1,34 @@ +# Release Package Schema + +The release package schema describes a container for releases. + +````{admonition} Example +:class: hint + +```{jsoninclude} ../../examples/release_schema_reference/release_package.json +:jsonpointer: +:title: Release package +``` +```` + +For this version of OCDS, the canonical URL of the release package schema is: . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. + +In addition to publishing the metadata described by the release package schema, you ought to license your data and guide data users. For more information, see the [licensing](../../guidance/publish.md#license-your-data) and [publication policy](../../guidance/publish.md#finalize-your-publication-policy) guidance. + +```{admonition} Browsing the schema +:class: note + +This page presents the release package schema in an interactive browser and in a table. You can also download the canonical version of the release package schema as [JSON Schema](../../../build/current_lang/release-package-schema.json). +``` + +## Schema browser + +Click on schema elements to expand the tree, or use the '+' icon to expand all elements. Use { } to view the underlying schema for any section. Required fields are indicated in **bold**. [Deprecated fields](../../governance/deprecation) and [multilingual fields](../reference.md#language) are omitted. + + + +## Reference table + +```{jsonschema} ../../../build/current_lang/release-package-schema.json +:collapse: releases +``` diff --git a/docs/schema/record.md b/docs/schema/record.md new file mode 100644 index 000000000..b60bb39e6 --- /dev/null +++ b/docs/schema/record.md @@ -0,0 +1,15 @@ +# Record Schema + +The record schema is used to check the structure of the `records` array of [record packages](packaging/record_package). + +For this version of OCDS, the canonical URL of the record schema is: . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. + +Click on schema elements to expand the tree, or use the '+' icon to expand all elements. Use { } to view the underlying schema for any section. Required fields are indicated in **bold**. [Deprecated fields](../governance/deprecation) and [multilingual fields](reference.md#language) are omitted. + +```{admonition} Browsing the schema +:class: note + +This page presents the record schema in an interactive browser. You can also download the canonical version of the record schema as [JSON Schema](../../build/current_lang/record-schema.json) or view it as [tables](records_reference). +``` + + diff --git a/docs/schema/record_package.md b/docs/schema/record_package.md deleted file mode 100644 index c6b17796b..000000000 --- a/docs/schema/record_package.md +++ /dev/null @@ -1,17 +0,0 @@ -# Record Package Schema - -The record package schema describes the structure of the container for publishing records. The contents of a record are based on the release schema. The package contains important metadata. - -A separate, auto-generated [versioned release schema](../../build/current_lang/versioned-release-validation-schema.json) is provided for validating versioned releases within records. - -For this version of OCDS, the canonical URL for the record package schema is and for the versioned release schema is . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. - -Click on schema elements to expand the tree, or use the '+' icon to expand all elements. Use { } to view the underlying schema for any section. Required fields are indicated in **bold**. [Deprecated fields](../governance/deprecation) and [multilingual fields](reference.md#language) are omitted. - -```{admonition} Browsing the schema -:class: note - -This page presents the record package schema in an interactive browser. You can also download the canonical version of the record package schema as [JSON Schema](../../build/current_lang/record-package-schema.json), or view it as [tables](records_reference). -``` - - diff --git a/docs/schema/records_reference.md b/docs/schema/records_reference.md index b3171895f..68aca7030 100644 --- a/docs/schema/records_reference.md +++ b/docs/schema/records_reference.md @@ -4,40 +4,20 @@ A record aggregates releases with the same [open contracting process identifier There should be a single record per ocid per [distribution](https://www.w3.org/TR/vocab-dcat-2/#Class:Distribution), where a distribution might be a specific API endpoint or a specific bulk download file. +Records must be published within a [record package](packaging/record_package). + **Note: If any conflicts are found between this text, and the text within the schema, the schema takes precedence.** ```{admonition} Browsing the schema :class: note -This page presents the record package schema as tables. You can also download the canonical version of the record package schema as [JSON Schema](../../build/current_lang/record-package-schema.json), or view it in an [interactive browser](record_package). +This page presents the record package schema as tables. You can also download the canonical version of the record package schema as [JSON Schema](../../build/current_lang/record-package-schema.json), or view it in an [interactive browser](record). ``` ```{workedexamplelist} The following worked examples are available for records :tag: record ``` -## Package metadata - -Records must be published within a [record package](record_package). The record package provides metadata about the record(s) that it contains. - -```{jsonschema} ../../build/current_lang/record-package-schema.json -:collapse: records -``` - -See the [licensing guidance](../guidance/publish.md#license-your-data) for more details on selecting a license, and publishing license information. - -See the [publication policy](../guidance/publish.md#finalize-your-publication-policy) guidance for more details on what to include in a publication policy. - -The record package metadata has one difference from the release package metadata: instead of a `releases` array, a record package has a `records` array containing one or more records. - -The following example demonstrates the package metadata and record fields. - -```{jsoninclude} ../examples/merging/updates/versioned.json -:jsonpointer: -:expand: records -:title: package -``` - ## Record structure A record **must** contain an [ocid](identifiers.md#open-contracting-process-identifier-ocid) and one or more of: @@ -47,6 +27,15 @@ A record **must** contain an [ocid](identifiers.md#open-contracting-process-iden A record **may** contain a [versionedRelease](#versioned-release) object, which aggregates, into a single object, all values of all fields from all releases up to the time of the record's publication. The versioned release is designed to make it easy to see how values change from one release to another, and will often be generated by data users, rather than by publishers. +````{admonition} Example +:class: hint + +```{jsoninclude} ../examples/merging/updates/versioned.json +:jsonpointer: /records/0 +:title: record +``` +```` + ### Releases Each release in a record can be provided as either a linked release or an embedded release. @@ -55,7 +44,7 @@ Each release in a record can be provided as either a linked release or an embedd A linked release follows a simple schema: -```{jsonschema} ../../build/current_lang/record-package-schema.json +```{jsonschema} ../../build/current_lang/record-schema.json :pointer: /definitions/LinkedRelease ``` @@ -109,6 +98,8 @@ This versioned information is relevant to many use cases relating to contract mo If the versioned release is not provided, third parties can generate it by processing the record's releases according to the [merging](merging) reference. +A separate, auto-generated [versioned release schema](../../build/current_lang/versioned-release-validation-schema.json) is provided for validating versioned releases within records. + The following example displays a single field's [versioned values](merging.md#versioned-values). This shows that the amount changed between the tender stage and a tender amendment, while the currency did not. ```{jsoninclude} ../examples/merging/updates/versioned.json diff --git a/docs/schema/reference.md b/docs/schema/reference.md index 7c8e8c580..2729a860b 100644 --- a/docs/schema/reference.md +++ b/docs/schema/reference.md @@ -4,6 +4,8 @@ The [Release Schema](release) provides a detailed specification of the fields an Releases are immutable – presenting information about a particular event in the lifetime of a contracting (or planning) process. Publishers must not edit a release after publication; a new release can be created by changing the release's `id` and `date`. +Releases must be published within a [release package](packaging/release_package). + **Note: If any conflicts are found between this text, and the text within the schema, the schema takes precedence.** ```{admonition} Browsing the schema @@ -64,43 +66,20 @@ A contract for ‘Software consultancy services’ is published in a release wit ## Release structure -The majority of OCDS data is held within a release structure. One or more releases can be published within a release package. Releases are made up of a number of sections, arranged in the following structure. +The majority of OCDS data is held within a release structure. One or more releases can be published within a [release package](packaging/release_package). Releases are made up of a number of sections, arranged in the following structure. -* [package](#package-metadata) - * [release](#release) - * [parties](#parties) - * [planning](#planning) - * [tender](#tender) - * [award](#award) - * [contract](#contract) - * [implementation](#implementation) +* [release](#release) + * [parties](#parties) + * [planning](#planning) + * [tender](#tender) + * [award](#award) + * [contract](#contract) + * [implementation](#implementation) A release has a [tag](codelists.md#release-tag) to indicate whether it is about a planning process or a contracting process and, if it is about the latter, to indicate the stage of the contracting process to which it relates. However, there are no formal restrictions on when information about a stage of the process can be provided. For example, a publisher announcing the signing of a contract with a 'contract' tag might also include information in the award and tender blocks in order to provide a comprehensive picture of the contracting process to date which led to that contract being signed. -### Package Metadata - -Releases must be published within a [release package](release_package). The release package provides metadata about the release(s) that it contains. - -````{admonition} Example -:class: hint - -```{jsoninclude} ../examples/release_schema_reference/release_package.json -:jsonpointer: -:expand: publisher -:title: package -``` -```` - -```{jsonschema} ../../build/current_lang/release-package-schema.json -:collapse: releases,publisher -``` - -See the [licensing guidance](../guidance/publish.md#license-your-data) for more details on selecting a license, and publishing license information. - -See the [publication policy](../guidance/publish.md#finalize-your-publication-policy) guidance for more details on what to include in a publication policy. - ### Release All new information about a contracting (or planning) process is described within a release. @@ -711,23 +690,6 @@ As well as providing this machine-readable link between processes, publishers ma The [Location](https://extensions.open-contracting.org/en/extensions/location/v1.1.4/) extension can be used to provide location information. -### Publisher - -The publisher block is used in release and record packages to identify the source of a dataset. - -````{admonition} Example -:class: hint - -```{jsoninclude} ../examples/release_schema_reference/release_package.json -:jsonpointer: /publisher -:title: publisher -``` -```` - -```{jsonschema} ../../build/current_lang/release-package-schema.json -:include: publisher -``` - ### Link The entries of the top-level `links` array are `Link` objects: diff --git a/docs/schema/release.md b/docs/schema/release.md index 705498e4a..d61cd9cce 100644 --- a/docs/schema/release.md +++ b/docs/schema/release.md @@ -1,6 +1,6 @@ # Release Schema -The release schema provides the authoritative definition of fields and their structure. It is used to check the structure of the `releases` array of [release packages](release_package), and any `compiledRelease` fields in a [record package](record_package). +The release schema provides the authoritative definition of fields and their structure. It is used to check the structure of the `releases` array of [release packages](packaging/release_package), and any `compiledRelease` fields in a [record](records_reference). For this version of OCDS, the canonical URL of the release schema is: . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. diff --git a/docs/schema/release_package.md b/docs/schema/release_package.md deleted file mode 100644 index 64bc3270a..000000000 --- a/docs/schema/release_package.md +++ /dev/null @@ -1,15 +0,0 @@ -# Release Package Schema - -The release package schema describes the structure of the container for publishing releases. The package contains important metadata. - -For this version of OCDS, the canonical URL of the release package schema is: . Using the canonical URL guarantees that your software, documentation or other resources will always refer to the specific version of the schema with which they were authored and tested. - -Click on schema elements to expand the tree, or use the '+' icon to expand all elements. Use { } to view the underlying schema for any section. Required fields are indicated in **bold**. [Deprecated fields](../governance/deprecation) and [multilingual fields](reference.md#language) are omitted. - -```{admonition} Browsing the schema -:class: note - -This page presents the release package schema in an interactive browser. You can also download the canonical version of the release package schema as [JSON Schema](../../build/current_lang/release-package-schema.json). -``` - - diff --git a/schema/record-package-schema.json b/schema/record-package-schema.json index c10189b4a..a674737b0 100644 --- a/schema/record-package-schema.json +++ b/schema/record-package-schema.json @@ -5,30 +5,15 @@ "description": "The record package contains a list of records along with some publishing metadata.", "type": "object", "properties": { - "links": { - "title": "Links", - "description": "Links to the next and previous sequential packages, to support pagination.", - "type": "object", - "properties": { - "next": { - "title": "Next", - "description": "A URL to the next sequential package.", - "type": "string", - "format": "uri" - }, - "prev": { - "title": "Previous", - "description": "A URL to the previous sequential package.", - "type": "string", - "format": "uri" - } - } - }, "uri": { "title": "Package identifier", "description": "The URI of this package that identifies it uniquely in the world.", "type": "string", - "format": "uri" + "format": "uri", + "deprecated": { + "description": "This field mirrored the `uri` field in the release package schema, which is deprecated.", + "deprecatedVersion": "1.2" + } }, "version": { "title": "OCDS schema version", @@ -81,9 +66,10 @@ "format": "uri" } }, - "required": [ - "name" - ] + "deprecated": { + "description": "This field is deprecated in favor of the `publisher` field in the release schema.", + "deprecatedVersion": "1.2" + } }, "license": { "title": "License", @@ -92,7 +78,11 @@ "string", "null" ], - "format": "uri" + "format": "uri", + "deprecated": { + "description": "It is not critical to distribute the license URL as data. The page linking to the data can express the license.", + "deprecatedVersion": "1.2" + } }, "publicationPolicy": { "title": "Publication policy", @@ -101,13 +91,21 @@ "string", "null" ], - "format": "uri" + "format": "uri", + "deprecated": { + "description": "It is not critical to distribute the publication policy URL as data. The page linking to the data can express the publication policy.", + "deprecatedVersion": "1.2" + } }, "publishedDate": { "title": "Published date", "description": "The date that this package was published. If this package is generated 'on demand', this date should reflect the date of the last change to the underlying contents of the package.", "type": "string", - "format": "date-time" + "format": "date-time", + "deprecated": { + "description": "This field repeats the maximum `date` among the releases it contains.", + "deprecatedVersion": "1.2" + } }, "packages": { "title": "Packages", @@ -129,122 +127,12 @@ "description": "The records for this data package.", "type": "array", "items": { - "$ref": "#/definitions/Record" - }, - "uniqueItems": true + "$ref": "https://standard.open-contracting.org/schema/1__2__0/record-schema.json" + } } }, "required": [ - "uri", - "publisher", - "publishedDate", "records", "version" - ], - "definitions": { - "Record": { - "title": "Record", - "description": "A record aggregates releases with the same open contracting process identifier (ocid). There should be a single record per ocid per [distribution](https://www.w3.org/TR/vocab-dcat-2/#Class:Distribution), where a distribution might be a specific API endpoint or a specific bulk download file.", - "type": "object", - "properties": { - "ocid": { - "title": "Open contracting process identifier", - "description": "A globally unique identifier for the contracting process that the record describes. Alternatively, this identifier can refer to a planning process or a single stage of a multi-stage procedure. It is composed of an ocid prefix and an internal identifier. It is encouraged to separate the ocds prefix and the internal identifier with a hyphen (`-`). For more information, see the [identifiers](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/) reference.", - "type": "string" - }, - "releases": { - "title": "Releases", - "description": "All the releases about the contracting (or planning) process at the time of the record's publication. The releases must be sorted in date order, from oldest to newest.", - "oneOf": [ - { - "title": "Linked releases", - "description": "A list of references to releases.", - "type": "array", - "items": { - "$ref": "#/definitions/LinkedRelease" - }, - "minItems": 1 - }, - { - "title": "Embedded releases", - "description": "A list of releases, with all the data.", - "type": "array", - "items": { - "$ref": "https://standard.open-contracting.org/schema/1__1__5/release-schema.json" - }, - "minItems": 1 - } - ] - }, - "compiledRelease": { - "title": "Compiled release", - "description": "The latest value of each field at the time of the record's publication. It follows the same schema as a release. A record should contain a compiled release.", - "$ref": "https://standard.open-contracting.org/schema/1__1__5/release-schema.json" - }, - "versionedRelease": { - "title": "Versioned release", - "description": "The history of values of each field up to the time of the record's publication.", - "$ref": "https://standard.open-contracting.org/schema/1__1__5/versioned-release-validation-schema.json" - } - }, - "required": [ - "ocid" - ] - }, - "LinkedRelease": { - "title": "Linked release", - "description": "A reference to a release.", - "type": "object", - "properties": { - "url": { - "title": "Release URL", - "description": "The URL of the release which contains the URL of the package with the release `id` appended using a fragment identifier e.g. https://standard.open-contracting.org/{{version}}/{{lang}}/examples/tender.json#ocds-213czf-000-00001", - "type": [ - "string", - "null" - ], - "format": "uri" - }, - "date": { - "title": "Release Date", - "description": "The date of the release. It should match the value of the `date` field of the release. This is used to sort the releases in the list in chronological order.", - "type": "string", - "format": "date-time" - }, - "tag": { - "title": "Release Tag", - "description": "The tags of the release. It should match the value of the `tag` field of the release. This provides additional context when reviewing a record to see what types of releases are included for this ocid.", - "type": "array", - "items": { - "type": "string", - "enum": [ - "planning", - "planningUpdate", - "tender", - "tenderAmendment", - "tenderUpdate", - "tenderCancellation", - "award", - "awardUpdate", - "awardCancellation", - "contract", - "contractUpdate", - "contractAmendment", - "implementation", - "implementationUpdate", - "contractTermination", - "compiled" - ] - }, - "codelist": "releaseTag.csv", - "openCodelist": false, - "minItems": 1 - } - }, - "required": [ - "url", - "date" - ] - } - } + ] } diff --git a/schema/record-schema.json b/schema/record-schema.json new file mode 100644 index 000000000..26a84c45c --- /dev/null +++ b/schema/record-schema.json @@ -0,0 +1,105 @@ +{ + "id": "https://standard.open-contracting.org/schema/1__2__0/record-schema.json", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Record", + "description": "A record aggregates releases with the same open contracting process identifier (ocid). There should be a single record per ocid per [distribution](https://www.w3.org/TR/vocab-dcat-2/#Class:Distribution), where a distribution might be a specific API endpoint or a specific bulk download file.", + "type": "object", + "properties": { + "ocid": { + "title": "Open contracting process identifier", + "description": "A globally unique identifier for the contracting process that the record describes. Alternatively, this identifier can refer to a planning process or a single stage of a multi-stage procedure. It is composed of an ocid prefix and an internal identifier. It is encouraged to separate the ocds prefix and the internal identifier with a hyphen (`-`). For more information, see the [identifiers](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/) reference.", + "type": "string" + }, + "releases": { + "title": "Releases", + "description": "All the releases about the contracting (or planning) process at the time of the record's publication. The releases must be sorted in date order, from oldest to newest.", + "oneOf": [ + { + "title": "Linked releases", + "description": "A list of references to releases.", + "type": "array", + "items": { + "$ref": "#/definitions/LinkedRelease" + }, + "minItems": 1 + }, + { + "title": "Embedded releases", + "description": "A list of releases, with all the data.", + "type": "array", + "items": { + "$ref": "https://standard.open-contracting.org/schema/1__1__5/release-schema.json" + }, + "minItems": 1 + } + ] + }, + "compiledRelease": { + "title": "Compiled release", + "description": "The latest value of each field at the time of the record's publication. It follows the same schema as a release. A record should contain a compiled release.", + "$ref": "https://standard.open-contracting.org/schema/1__1__5/release-schema.json" + }, + "versionedRelease": { + "title": "Versioned release", + "description": "The history of values of each field up to the time of the record's publication.", + "$ref": "https://standard.open-contracting.org/schema/1__1__5/versioned-release-validation-schema.json" + } + }, + "required": [ + "ocid" + ], + "definitions": { + "LinkedRelease": { + "title": "Linked release", + "description": "A reference to a release.", + "type": "object", + "properties": { + "url": { + "title": "Release URL", + "description": "The URL of the release which contains the URL of the package with the release `id` appended using a fragment identifier e.g. https://standard.open-contracting.org/{{version}}/{{lang}}/examples/tender.json#ocds-213czf-000-00001", + "type": "string", + "format": "uri" + }, + "date": { + "title": "Release Date", + "description": "The date of the release. It should match the value of the `date` field of the release. This is used to sort the releases in the list in chronological order.", + "type": "string", + "format": "date-time" + }, + "tag": { + "title": "Release Tag", + "description": "The tags of the release. It should match the value of the `tag` field of the release. This provides additional context when reviewing a record to see what types of releases are included for this ocid.", + "type": "array", + "items": { + "type": "string", + "enum": [ + "planning", + "planningUpdate", + "tender", + "tenderAmendment", + "tenderUpdate", + "tenderCancellation", + "award", + "awardUpdate", + "awardCancellation", + "contract", + "contractUpdate", + "contractAmendment", + "implementation", + "implementationUpdate", + "contractTermination", + "compiled" + ] + }, + "codelist": "releaseTag.csv", + "openCodelist": false, + "minItems": 1 + } + }, + "required": [ + "url", + "date" + ] + } + } +} diff --git a/schema/release-package-schema.json b/schema/release-package-schema.json index 638ca5c74..9700ebb37 100644 --- a/schema/release-package-schema.json +++ b/schema/release-package-schema.json @@ -5,37 +5,19 @@ "description": "The release package contains a list of releases along with some publishing metadata.", "type": "object", "required": [ - "uri", - "publisher", - "publishedDate", "releases", "version" ], "properties": { - "links": { - "title": "Links", - "description": "Links to the next and previous sequential packages, to support pagination.", - "type": "object", - "properties": { - "next": { - "title": "Next", - "description": "A URL to the next sequential package.", - "type": "string", - "format": "uri" - }, - "prev": { - "title": "Previous", - "description": "A URL to the previous sequential package.", - "type": "string", - "format": "uri" - } - } - }, "uri": { "title": "Package identifier", "description": "The URI of this package that identifies it uniquely in the world. Recommended practice is to use a dereferenceable URI, where a persistent copy of this package is available.", "type": "string", - "format": "uri" + "format": "uri", + "deprecated": { + "description": "This field was used by the `packages` field in the record package schema, which is deprecated.", + "deprecatedVersion": "1.2" + } }, "version": { "title": "OCDS schema version", @@ -56,7 +38,11 @@ "title": "Published date", "description": "The date that this package was published. If this package is generated 'on demand', this date should reflect the date of the last change to the underlying contents of the package.", "type": "string", - "format": "date-time" + "format": "date-time", + "deprecated": { + "description": "This field repeats the maximum `date` among the releases it contains.", + "deprecatedVersion": "1.2" + } }, "releases": { "title": "Releases", @@ -64,8 +50,7 @@ "type": "array", "items": { "$ref": "https://standard.open-contracting.org/schema/1__1__5/release-schema.json" - }, - "uniqueItems": true + } }, "publisher": { "title": "Publisher", @@ -103,9 +88,10 @@ "format": "uri" } }, - "required": [ - "name" - ] + "deprecated": { + "description": "This field is deprecated in favor of the `publisher` field in the release schema.", + "deprecatedVersion": "1.2" + } }, "license": { "title": "License", @@ -114,7 +100,11 @@ "string", "null" ], - "format": "uri" + "format": "uri", + "deprecated": { + "description": "It is not critical to distribute the license URL as data. The page linking to the data can express the license.", + "deprecatedVersion": "1.2" + } }, "publicationPolicy": { "title": "Publication policy", @@ -123,7 +113,11 @@ "string", "null" ], - "format": "uri" + "format": "uri", + "deprecated": { + "description": "It is not critical to distribute the publication policy URL as data. The page linking to the data can express the publication policy.", + "deprecatedVersion": "1.2" + } } } }