Merge branch '1.2-dev' into 1583-planning-final-status

open-contracting · Mar 27, 2024 · 70c8ef5 · 70c8ef5
2 parents 6280ceb + 1ebc554
commit 70c8ef5
Show file tree

Hide file tree

Showing 154 changed files with 3,248 additions and 4,723 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: pip
@@ -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/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -5,8 +5,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
       - run: npm install standard eslint-plugin-import@2.26.0

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,8 +7,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
           cache: pip

diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml
@@ -5,7 +5,7 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install shellcheck
         run: |
           sudo apt update

diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -5,8 +5,8 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - run: pip install codespell

diff --git a/common-requirements.txt b/common-requirements.txt
@@ -64,7 +64,7 @@ imagesize==1.4.1
     # via sphinx
 iniconfig==1.1.1
     # via pytest
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   myst-parser
     #   sphinx
@@ -103,7 +103,7 @@ packaging==21.3
     #   build
     #   pytest
     #   sphinx
-pip-tools==6.13.0
+pip-tools==7.3.0
     # via -r common-requirements.in
 platformdirs==3.9.1
     # via requests-cache
@@ -168,6 +168,7 @@ sphinxcontrib-serializinghtml==1.1.5
 tomli==2.0.1
     # via
     #   build
+    #   pip-tools
     #   pyproject-hooks
     #   pytest
 tornado==6.3.3
@@ -186,7 +187,7 @@ uc-micro-py==1.0.1
     # via linkify-it-py
 url-normalize==1.4.3
     # via requests-cache
-urllib3[socks]==1.26.5
+urllib3[socks]==1.26.18
     # via
     #   elastic-transport
     #   requests

diff --git 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": [
     {
@@ -19,7 +13,6 @@
           ],
           "contracts": [
             {
-              "status": "active",
               "description": "Appliances for Tuvalu PPB Residence",
               "title": "4501062723",
               "items": [
@@ -103,7 +96,6 @@
           ],
           "contracts": [
             {
-              "status": "active",
               "amendments": [
                 {
                   "id": "1",
@@ -189,7 +181,6 @@
         "contracts": [
           {
             "id": "CN3562241",
-            "status": "active",
             "description": "Appliances for Tuvalu PPB Residence",
             "title": "4501062723",
             "items": [
@@ -286,16 +277,6 @@
         "contracts": [
           {
             "id": "CN3562241",
-            "status": [
-              {
-                "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
-                "releaseDate": "2019-02-15T01:00:58Z",
-                "releaseTag": [
-                  "contract"
-                ],
-                "value": "active"
-              }
-            ],
             "description": [
               {
                 "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",

diff --git 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": [
     {
@@ -44,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": [
@@ -215,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": [
@@ -486,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",
@@ -500,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/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": [
     {
@@ -44,7 +34,6 @@
             "id": "ocds-213czf-000-00002-01-tender",
             "title": "Data merging tool",
             "description": "Data merge tool.",
-            "status": "active",
             "value": {
               "amount": 1000,
               "currency": "USD"
@@ -91,7 +80,6 @@
             "id": "ocds-213czf-000-00002-01-tender",
             "title": "Data merging tool",
             "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
-            "status": "active",
             "value": {
               "amount": 1000,
               "currency": "USD"
@@ -138,7 +126,6 @@
             "id": "ocds-213czf-000-00002-01-tender",
             "title": "Data merging tool",
             "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
-            "status": "active",
             "value": {
               "amount": 2000,
               "currency": "USD"
@@ -195,7 +182,6 @@
           "id": "ocds-213czf-000-00002-01-tender",
           "title": "Data merging tool",
           "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
-          "status": "active",
           "value": {
             "amount": 2000,
             "currency": "USD"
@@ -353,16 +339,6 @@
               "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail."
             }
           ],
-          "status": [
-            {
-              "releaseID": "ocds-213czf-000-00002-01-tender",
-              "releaseDate": "2016-01-01T09:30:00Z",
-              "releaseTag": [
-                "tender"
-              ],
-              "value": "active"
-            }
-          ],
           "value": {
             "amount": [
               {

diff --git 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": [
     {
@@ -32,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
@@ -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"
@@ -40,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
@@ -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": [
@@ -88,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",
@@ -183,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
@@ -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": [
@@ -89,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,
@@ -152,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"