Merge branch '1.2-dev' into 1666-make-examples-minimal (conflicts due…

… to removal of "status")
open-contracting · Mar 27, 2024 · 0984ff8 · 0984ff8
2 parents 0d34b8a + 1ebc554
commit 0984ff8
Show file tree

Hide file tree

Showing 67 changed files with 987 additions and 1,198 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
           key: ${{ secrets.PRIVATE_KEY }}
           known_hosts: standard.open-contracting.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGveFGTJ9yyObNGDUCUyzyFkm6Kzh3YqIt1qB7B/KU6E
       - if: github.event_name == 'push'
-        uses: bcomnes/netrc-creds@v2
+        uses: bcomnes/netrc-creds@v3
         with:
           machine: standard.open-contracting.org
           login: manage

diff --git a/docs/examples/amendments/easy_releases.json b/docs/examples/amendments/easy_releases.json
@@ -38,14 +38,13 @@
             "procurementMethod": "limited",
             "procurementMethodDetails": "Limited tender",
             "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319",
-            "status": "complete"
+            "finalStatus": "complete"
           },
           "id": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z"
         },
         {
           "contracts": [
             {
-              "status": "active",
               "description": "Drupal websites in govCMS Platform Solution.",
               "title": "4400027941",
               "items": [
@@ -209,12 +208,11 @@
           "procurementMethod": "limited",
           "procurementMethodDetails": "Limited tender",
           "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319",
-          "status": "complete"
+          "finalStatus": "complete"
         },
         "contracts": [
           {
             "id": "CN3437424",
-            "status": "active",
             "description": "Drupal websites in govCMS Platform Solution.",
             "title": "4400027941",
             "items": [
@@ -480,7 +478,7 @@
               "value": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319"
             }
           ],
-          "status": [
+          "finalStatus": [
             {
               "releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z",
               "releaseDate": "2015-04-04T00:00:00Z",
@@ -494,17 +492,6 @@
         "contracts": [
           {
             "id": "CN3437424",
-            "status": [
-              {
-                "releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z",
-                "releaseDate": "2015-05-04T00:00:00Z",
-                "releaseTag": [
-                  "award",
-                  "contract"
-                ],
-                "value": "active"
-              }
-            ],
             "description": [
               {
                 "releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z",

diff --git a/docs/examples/beneficial_ownership/award.json b/docs/examples/beneficial_ownership/award.json
@@ -27,7 +27,6 @@
       "awards": [
         {
           "id": "6031d3f9-f86b-462c-80b2-4a02c760ddcd",
-          "status": "active",
           "date": "2021-06-07T00:00:00Z",
           "value": {
             "amount": 32191,

diff --git a/docs/examples/beneficial_ownership/beneficial_owners_extension.json b/docs/examples/beneficial_ownership/beneficial_owners_extension.json
@@ -35,7 +35,6 @@
       "awards": [
         {
           "id": "f867a510-0edf-11eb-a6ca-b5f4fa6e44dc",
-          "status": "active",
           "date": "2020-10-18T12:21:56Z",
           "value": {
             "amount": 56660,

diff --git a/docs/examples/change_history/award.json b/docs/examples/change_history/award.json
@@ -78,7 +78,7 @@
         "id": "ocds-213czf-000-00001-01-tender",
         "title": "Planned cycle lane improvements",
         "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-        "status": "complete",
+        "finalStatus": "complete",
         "items": [
           {
             "id": "0001",
@@ -173,7 +173,6 @@
           "id": "ocds-213czf-000-00001-award-01",
           "title": "Award of contract to build new cycle lanes in the centre of town.",
           "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-          "status": "pending",
           "date": "2010-05-10T09:30:00Z",
           "value": {
             "amount": 11000000,

diff --git a/docs/examples/change_history/contract.json b/docs/examples/change_history/contract.json
@@ -79,7 +79,6 @@
           "id": "ocds-213czf-000-00001-award-01",
           "title": "Award of contract to build new cycle lanes in the centre of town.",
           "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-          "status": "active",
           "date": "2010-05-10T09:30:00Z",
           "value": {
             "amount": 11000000,
@@ -142,7 +141,6 @@
           "awardID": "ocds-213czf-000-00001-award-01",
           "title": "Contract to build new cycle lanes in the centre of town.",
           "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.",
-          "status": "active",
           "period": {
             "startDate": "2010-07-01T00:00:00Z",
             "endDate": "2011-08-01T23:59:00Z"

diff --git a/docs/examples/change_history/contractAmendment.json b/docs/examples/change_history/contractAmendment.json
@@ -79,7 +79,6 @@
           "id": "ocds-213czf-000-00001-award-01",
           "title": "Award of contract to build new cycle lanes in the centre of town.",
           "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-          "status": "active",
           "date": "2010-05-10T10:30:00Z",
           "value": {
             "amount": 11000000,
@@ -142,7 +141,6 @@
           "awardID": "ocds-213czf-000-00001-award-01",
           "title": "Contract to build new cycle lanes in the centre of town.",
           "description": "Contract monitoring for cycle lane construction.",
-          "status": "active",
           "period": {
             "startDate": "2010-07-01T00:00:00Z",
             "endDate": "2011-10-30T23:59:00Z"

diff --git a/docs/examples/change_history/records/award.json b/docs/examples/change_history/records/award.json
@@ -49,7 +49,6 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "active",
             "items": [
               {
                 "id": "0001",
@@ -166,7 +165,6 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "active",
             "items": [
               {
                 "id": "0001",
@@ -333,7 +331,7 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "complete",
+            "finalStatus": "complete",
             "items": [
               {
                 "id": "0001",
@@ -428,7 +426,6 @@
               "id": "ocds-213czf-000-00001-award-01",
               "title": "Award of contract to build new cycle lanes in the centre of town.",
               "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-              "status": "pending",
               "date": "2010-05-10T09:30:00Z",
               "value": {
                 "amount": 11000000,
@@ -563,7 +560,7 @@
           "id": "ocds-213czf-000-00001-01-tender",
           "title": "Planned cycle lane improvements",
           "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-          "status": "complete",
+          "finalStatus": "complete",
           "items": [
             {
               "id": "0001",
@@ -658,7 +655,6 @@
             "id": "ocds-213czf-000-00001-award-01",
             "title": "Award of contract to build new cycle lanes in the centre of town.",
             "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-            "status": "pending",
             "date": "2010-05-10T09:30:00Z",
             "value": {
               "amount": 11000000,
@@ -1131,15 +1127,7 @@
               "value": "Tenders solicited for work to build new cycle lanes in the centre of town."
             }
           ],
-          "status": [
-            {
-              "releaseID": "ocds-213czf-000-00001-02-tender",
-              "releaseDate": "2010-03-15T09:30:00Z",
-              "releaseTag": [
-                "tender"
-              ],
-              "value": "active"
-            },
+          "finalStatus": [
             {
               "releaseID": "ocds-213czf-000-00001-04-award",
               "releaseDate": "2010-05-10T09:30:00Z",
@@ -1674,16 +1662,6 @@
                 "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town."
               }
             ],
-            "status": [
-              {
-                "releaseID": "ocds-213czf-000-00001-04-award",
-                "releaseDate": "2010-05-10T09:30:00Z",
-                "releaseTag": [
-                  "award"
-                ],
-                "value": "pending"
-              }
-            ],
             "date": [
               {
                 "releaseID": "ocds-213czf-000-00001-04-award",

diff --git a/docs/examples/change_history/records/contract.json b/docs/examples/change_history/records/contract.json
@@ -49,7 +49,6 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "active",
             "items": [
               {
                 "id": "0001",
@@ -166,7 +165,6 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "active",
             "items": [
               {
                 "id": "0001",
@@ -333,7 +331,7 @@
             "id": "ocds-213czf-000-00001-01-tender",
             "title": "Planned cycle lane improvements",
             "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-            "status": "complete",
+            "finalStatus": "complete",
             "items": [
               {
                 "id": "0001",
@@ -428,7 +426,6 @@
               "id": "ocds-213czf-000-00001-award-01",
               "title": "Award of contract to build new cycle lanes in the centre of town.",
               "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-              "status": "pending",
               "date": "2010-05-10T09:30:00Z",
               "value": {
                 "amount": 11000000,
@@ -563,7 +560,6 @@
               "id": "ocds-213czf-000-00001-award-01",
               "title": "Award of contract to build new cycle lanes in the centre of town.",
               "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-              "status": "active",
               "date": "2010-05-10T09:30:00Z",
               "value": {
                 "amount": 11000000,
@@ -626,7 +622,6 @@
               "awardID": "ocds-213czf-000-00001-award-01",
               "title": "Contract to build new cycle lanes in the centre of town.",
               "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.",
-              "status": "active",
               "period": {
                 "startDate": "2010-07-01T00:00:00Z",
                 "endDate": "2011-08-01T23:59:00Z"
@@ -755,7 +750,7 @@
           "id": "ocds-213czf-000-00001-01-tender",
           "title": "Planned cycle lane improvements",
           "description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
-          "status": "complete",
+          "finalStatus": "complete",
           "items": [
             {
               "id": "0001",
@@ -850,7 +845,6 @@
             "id": "ocds-213czf-000-00001-award-01",
             "title": "Award of contract to build new cycle lanes in the centre of town.",
             "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
-            "status": "active",
             "date": "2010-05-10T09:30:00Z",
             "value": {
               "amount": 11000000,
@@ -913,7 +907,6 @@
             "awardID": "ocds-213czf-000-00001-award-01",
             "title": "Contract to build new cycle lanes in the centre of town.",
             "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.",
-            "status": "active",
             "period": {
               "startDate": "2010-07-01T00:00:00Z",
               "endDate": "2011-08-01T23:59:00Z"
@@ -1380,15 +1373,7 @@
               "value": "Tenders solicited for work to build new cycle lanes in the centre of town."
             }
           ],
-          "status": [
-            {
-              "releaseID": "ocds-213czf-000-00001-02-tender",
-              "releaseDate": "2010-03-15T09:30:00Z",
-              "releaseTag": [
-                "tender"
-              ],
-              "value": "active"
-            },
+          "finalStatus": [
             {
               "releaseID": "ocds-213czf-000-00001-04-award",
               "releaseDate": "2010-05-10T09:30:00Z",
@@ -1923,24 +1908,6 @@
                 "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town."
               }
             ],
-            "status": [
-              {
-                "releaseID": "ocds-213czf-000-00001-04-award",
-                "releaseDate": "2010-05-10T09:30:00Z",
-                "releaseTag": [
-                  "award"
-                ],
-                "value": "pending"
-              },
-              {
-                "releaseID": "ocds-213czf-000-00001-05-contract",
-                "releaseDate": "2010-06-10T10:30:00Z",
-                "releaseTag": [
-                  "contract"
-                ],
-                "value": "active"
-              }
-            ],
             "date": [
               {
                 "releaseID": "ocds-213czf-000-00001-04-award",
@@ -2236,16 +2203,6 @@
                 "value": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town."
               }
             ],
-            "status": [
-              {
-                "releaseID": "ocds-213czf-000-00001-05-contract",
-                "releaseDate": "2010-06-10T10:30:00Z",
-                "releaseTag": [
-                  "contract"
-                ],
-                "value": "active"
-              }
-            ],
             "period": {
               "startDate": [
                 {