Merge branch '1.2' into 236-remove-core-codes

open-contracting-extensions · Feb 12, 2025 · 60c605c · 60c605c
2 parents 7b8a0b3 + b18e3bf
commit 60c605c
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 66 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -1,25 +1,8 @@
-# The pull_request_target workflow trigger is dangerous. Do not add unrelated logic to this workflow.
-# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
-# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target
 name: Auto-merge
 on: pull_request_target
-permissions:
-  pull-requests: write  # to approve the PR
-  contents: write  # to merge the PR
 jobs:
-  dependabot:
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    runs-on: ubuntu-latest
-    steps:
-      - id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' || steps.dependabot-metadata.outputs.package-ecosystem == 'github_actions' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh pr review --approve ${{ github.event.pull_request.html_url }}
-      - if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' || steps.dependabot-metadata.outputs.package-ecosystem == 'github_actions' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh pr merge --auto --squash ${{ github.event.pull_request.html_url }}
+  automerge:
+    uses: open-contracting/.github/.github/workflows/automerge.yml@main
+    permissions:
+      pull-requests: write
+      contents: write
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,21 +1,7 @@
 name: Lint
 on: [push, pull_request]
-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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-      - shell: bash
-        run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
-      - shell: bash
-        run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
+  lint:
+    uses: open-contracting/.github/.github/workflows/lint.yml@main
+    with:
+      python-version: '3.10'
diff --git a/README.md b/README.md
@@ -28,6 +28,14 @@ For complete guidance on meeting the disclosure requirements of European law, se
       ]
     }
   ],
+  "bids": {
+    "details": [
+      {
+        "id": "1",
+        "foreignSubsidyMeasures": "fsr-stand"
+      }
+    ]
+  },
   "tender": {
     "contractPeriod": {
       "description": "unknown"
@@ -43,16 +51,7 @@ For complete guidance on meeting the disclosure requirements of European law, se
           "id": "45233130.0",
           "description": "Office supplies",
           "uri": "http://cpv.data.ac.uk/code-45233130"
-        },
-        "deliveryAddresses": [
-          {
-            "streetAddress": "4, North London Business Park, Oakleigh Rd S",
-            "locality": "London",
-            "region": "London",
-            "postalCode": "N11 1NP",
-            "countryName": "United Kingdom"
-          }
-        ]
+        }
       }
     ],
     "legislativeReferences": [
@@ -75,7 +74,14 @@ For complete guidance on meeting the disclosure requirements of European law, se
         },
         "contractPeriod": {
           "description": "unknown"
-        }
+        },
+        "additionalClassifications": [
+          {
+            "id": "oth-serv-contr",
+            "scheme": "eu-cvd-contract-type",
+            "description": "Other service contract"
+          }
+        ]
       }
     ],
     "milestones": [
@@ -99,7 +105,19 @@ For complete guidance on meeting the disclosure requirements of European law, se
   "awards": [
     {
       "id": "award-1",
-      "valueCalculationMethod": "The awarded value takes into account the growing revenue expected from fees and the value of the equipment provided by the contracting authority."
+      "valueCalculationMethod": "The awarded value takes into account the growing revenue expected from fees and the value of the equipment provided by the contracting authority.",
+      "items": [
+        {
+          "id": "1",
+          "additionalClassifications": [
+            {
+              "scheme": "eu-vehicle-category",
+              "id": "n2-n3",
+              "description": "Truck (N2-N3)"
+            }
+          ]
+        }
+      ]
     }
   ],
   "contracts": [
@@ -109,6 +127,17 @@ For complete guidance on meeting the disclosure requirements of European law, se
       "publicPassengerTransportServicesKilometers": 765,
       "awardID": "award-1"
     }
+  ],
+  "relatedProcesses": [
+    {
+      "id": "1",
+      "identifier": "123e4567-e89b-12d3-a456-426614174000-06",
+      "part": "PAR-0001",
+      "scheme": "eu-notice-id-ref",
+      "relationship": [
+        "planning"
+      ]
+    }
   ]
 }
 ```
@@ -128,21 +157,29 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 
 ### 2025-02-11
 
-* Add 'eu-vehicles' to `+classificationScheme.csv`.
+* Add 'eu-vehicles' code to the `+classificationScheme.csv` codelist patch.
+* Add a `+partyRole.csv` codelist patch, with 'procurementServiceProvider' and 'eSender' codes.
+
+### 2025-02-04
+
+* Add `RelatedProcess.part` field.
+* Update the `+relatedProcessScheme.csv` codelist patch:
+  * Add 'eu-notice-id-ref'
+  * Add 'eu-ojs-notice-id'
+  * Remove 'eu-oj'
 
-### 2024-12-16
+### 2024-10-18
 
-* Add codelists:
-  * `+classificationScheme.csv`
-  * `+partyRole.csv`
-  * `+relatedProcessScheme.csv`
+* Add `Bid.foreignSubsidyMeasures` field.
+* Add a `foreignSubsidyMeasures.csv` codelist for `Bid.foreignSubsidyMeasures`.
+* Remove `Item.deliveryAddresses` field (now in Location extension).
 
 ### 2024-10-08
 
 * Add fields:
   * `SelectionCriteria.sources`
   * `ExclusionGrounds.sources`
-* Add `sources.csv` codelist
+* Add a `sources.csv` codelist for `SelectionCriteria.sources` and `ExclusionGrounds.sources`.
 
 ### 2023-08-01
 
@@ -155,6 +192,8 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 ### 2023-06-30
 
 * Add `Period.description` field.
+* Add a `+classificationScheme.csv` codelist patch, with 'eu-vehicle-category' and 'eu-cvd-contract-type' codes.
+* Add a `+relatedProcessScheme.csv` codelist patch, with a 'eu-oj' code.
 
 ### 2022-05-27
 
@@ -170,7 +209,7 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 ### 2021-01-19
 
 * Set the object type of `informationService` to `OrganizationReference`.
-* Add 'informationService' code to `+partyRole.csv` codelist.
+* Add 'informationService' code to the `+partyRole.csv` codelist patch.
 
 ### 2020-10-06
 
@@ -182,7 +221,7 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 
 ### 2020-07-13
 
-* Add the 'securityClearanceDeadline' code to the `+milestoneType.csv` codelist.
+* Add 'securityClearanceDeadline' code to the `+milestoneType.csv` codelist patch.
 
 ### 2020-04-29
 

diff --git a/codelists/+classificationScheme.csv b/codelists/+classificationScheme.csv
@@ -1,4 +1,4 @@
 Code,Title,Description,Source
 eu-vehicles,European Union vehicle type,The type of vehicle specified in eForms.,https://docs.ted.europa.eu/eforms/latest/reference/code-lists/vehicles.html
-eu-vehicle-category,European Union vehicle category,The category of vehicle falling within the scope of the EU Clean Vehicles Directive 2009/33/EC.,https://op.europa.eu/en/web/eu-vocabularies/concept-scheme/-/resource?uri=http://publications.europa.eu/resource/authority/vehicle-category
+eu-vehicle-category,European Union Clean Vehicle Directive vehicle category,The category of vehicle falling within the scope of the EU Clean Vehicles Directive 2009/33/EC.,https://op.europa.eu/en/web/eu-vocabularies/concept-scheme/-/resource?uri=http://publications.europa.eu/resource/authority/vehicle-category
 eu-cvd-contract-type,European Union Clean Vehicle Directive contract type,The category of contract according to the EU Clean Vehicles Directive 2009/33/EC.,https://op.europa.eu/en/web/eu-vocabularies/concept-scheme/-/resource?uri=http://publications.europa.eu/resource/authority/cvd-contract-type
diff --git a/codelists/+relatedProcessScheme.csv b/codelists/+relatedProcessScheme.csv
@@ -1,2 +1,3 @@
 Code,Title,Description
-eu-oj,Official Journal of the European Union,An Official Journal of the European Union contracting process identifier.
+eu-notice-id-ref,eForms versioned notice identifier,An eForms notice identifier (UUID) concatenated with the associated version identifier (2 digits) in the form {UUID}-{vv}.
+eu-ojs-notice-id,Official Journal of the European Union notice identifier,"An Official Journal of the European Union notice identifier, also known as a Notice Publication ID in eForms."
diff --git a/codelists/foreignSubsidyMeasures.csv b/codelists/foreignSubsidyMeasures.csv
@@ -0,0 +1,8 @@
+Code,Title,Description
+fsr-adm-clos,"Notification submitted, administrative closure of FSR preliminary review procedure","The Commission conducted its preliminary review procedure and did not issue a decision before the end of the time limit prescribed by the Foreign Subsidies Regulation (FSR). The FSR procedure ended, and the Buyer can award the contract to the tenderer that submitted the notification."
+fsr-commit,"Notification submitted, decision with commitments","The Commission conducted its in-depth investigation and concluded that there are distortive foreign subsidies, but the tenderer provided commitments that remedy the distortion. The Buyer can award the contract to the tenderer that was under in-depth investigation."
+fsr-irregul,"Notification submitted, decision on irregular tender or request to participate","The Commission conducted a preliminary review and found that the notification was incomplete, and requested more information from the economic operator who did not comply. The Commission declared the tender or request to participate irregular and requests the Buyer to reject the tender or request to participate."
+fsr-meat,"Declaration submitted, standard MEAT award","The Commission has started an in-depth investigation on the tenderer. However, this tenderer did not submit the most economically advantageous tender (MEAT). There was another tenderer who submitted a declaration and MEAT. The Commission did not open an in-depth investigation against that tenderer. Therefore, the Buyer can award the contract to that tenderer with the MEAT."
+fsr-no-obj,"Notification submitted, decision with no objection","The Commission conducted its in-depth investigation and concluded that there is no distortion, the Buyer can award the contract to the tenderer that was under in-depth investigation, the Foreign Subsidies Regulation procedure is closed."
+fsr-proh,"Notification submitted, decision prohibiting the award","The Commission conducted its in-depth investigation and concluded that there are distortive foreign subsidies. Therefore, it issued a decision to the Buyer prohibiting the award to the tenderer that was under in-depth investigation."
+fsr-stand,"Declaration submitted, standard award procedure","A tenderer submitted a declaration to the Commission, but the Commission did not open an in-depth investigation. Therefore, the Buyer can award the contract to the tenderer that submitted that declaration."
diff --git a/extension.json b/extension.json
@@ -18,17 +18,19 @@
     "+classificationScheme.csv",
     "+partyRole.csv",
     "+relatedProcessScheme.csv",
+    "foreignSubsidyMeasures.csv",
     "sources.csv"
   ],
   "contactPoint": {
     "name": "Open Contracting Partnership",
     "email": "[email protected]"
   },
   "testDependencies": [
-    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_submissionTerms_extension/master/extension.json",
-    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_lots_extension/master/extension.json",
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_bid_extension/master/extension.json",
     "https://raw.githubusercontent.com/open-contracting-extensions/ocds_document_publisher_extension/master/extension.json",
     "https://raw.githubusercontent.com/open-contracting-extensions/ocds_exclusionGrounds_extension/master/extension.json",
-    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_selectionCriteria_extension/master/extension.json"
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_lots_extension/master/extension.json",
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_selectionCriteria_extension/master/extension.json",
+    "https://raw.githubusercontent.com/open-contracting-extensions/ocds_submissionTerms_extension/master/extension.json"
   ]
 }
diff --git a/release-schema.json b/release-schema.json
@@ -116,6 +116,19 @@
         }
       }
     },
+    "RelatedProcess": {
+      "properties": {
+        "part": {
+          "title": "Part",
+          "description": "The identifier of a part of a prior information notice, or another similar notice, that describes a planning process.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "minLength": 1
+        }
+      }
+    },
     "LegislativeReference": {
       "title": "Legislative reference",
       "description": "Legislative reference and associated contact point",
@@ -229,6 +242,30 @@
           "minItems": 1
         }
       }
+    },
+    "Bid": {
+      "properties": {
+        "foreignSubsidyMeasures": {
+          "title": "Foreign subsidy measures",
+          "description": "The measures applied under the Foreign Subsidies Regulation (EU) 2022/2560.",
+          "type": [
+            "string",
+            "null"
+          ],
+          "enum": [
+            "fsr-adm-clos",
+            "fsr-commit",
+            "fsr-irregul",
+            "fsr-meat",
+            "fsr-no-obj",
+            "fsr-proh",
+            "fsr-stand",
+            null
+          ],
+          "codelist": "foreignSubsidyMeasures.csv",
+          "openCodelist": false
+        }
+      }
     }
   }
 }