Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove preQualification extension, update framework reference #245

Merged
merged 24 commits into from
Mar 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
299b625
remove preQualification extension, update framework reference
duncandewhurst Jan 11, 2021
863a8c7
Update docs/framework.md
duncandewhurst Jan 13, 2021
f68db11
Update docs/framework.md
duncandewhurst Jan 13, 2021
475291c
update rfq guidance
duncandewhurst Jan 13, 2021
7a95a3c
add RFP guidance
duncandewhurst Jan 13, 2021
3580beb
update guidance for list of pre-qualified suppliers
duncandewhurst Jan 13, 2021
0cebe82
remove reference to qualification releaseTag code
duncandewhurst Jan 13, 2021
94a63f7
remove releaseTag codelist
duncandewhurst Jan 13, 2021
0ba067b
Merge branch '1.0-dev' into 217-remove-preQualification-extension, re…
duncandewhurst Jan 14, 2021
5f303d1
update example
duncandewhurst Jan 29, 2021
0e4ff46
run build-profile.py, remove prequalification codes from tag enum
duncandewhurst Feb 3, 2021
f2a34e0
remove qualification codelist csvs and tag enum
duncandewhurst Feb 3, 2021
75ff1fc
Correct json pointers and field paths
duncandewhurst Feb 3, 2021
2945dcb
Update contract period guidance to match disclosure timing table.
duncandewhurst Feb 3, 2021
8535f78
update changelog
duncandewhurst Feb 3, 2021
5cfeab1
Fix capitalization of Fiber
duncandewhurst Feb 14, 2021
f128f1f
Update docs/framework.md
duncandewhurst Feb 14, 2021
6768b6c
Update docs/framework.md
duncandewhurst Feb 14, 2021
e5c69d0
Update docs/framework.md
duncandewhurst Feb 14, 2021
355ebf5
Update docs/framework.md
duncandewhurst Feb 14, 2021
fba7998
Merge branch '1.0-dev' into 217-remove-preQualification-extension
duncandewhurst Feb 15, 2021
ef0651d
Update framework reference
duncandewhurst Feb 19, 2021
bb39f0b
Update docs/framework.md
duncandewhurst Feb 22, 2021
fb58a93
build: Remove instructions about where to edit examples
jpmckinney Feb 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
For full documentation of OCDS for PPPs see http://standard.open-contracting.org/profiles/ppp/

This extension should always be declared by referring to the deployed version, e.g. http://standard.open-contracting.org/profiles/ppp/schema/1__0__0__beta2/extension.json

**DO NOT EDIT** the files in `docs/examples`. Instead, edit those files in the `ocds-show` repository, copy the files to the `ocds-show-ppp` repository, and then run `make update_examples`.
626 changes: 294 additions & 332 deletions docs/examples/full.json

Large diffs are not rendered by default.

21,957 changes: 21,605 additions & 352 deletions docs/examples/full_record_package.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/extension_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"performance_failures": "master",
"process_title": "v1.1.4",
"project": "master",
"qualification": "master",
"requirements": "master",
"risk_allocation": "master",
"shareholders": "master",
Expand Down
481 changes: 130 additions & 351 deletions docs/framework.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ It draws upon the following extensions from the [OCDS extension registry](http:/
* risk_allocation
* shareholders
* finance
* qualification
* tariffs
* performance_failures
* signatories
Expand Down
1 change: 1 addition & 0 deletions docs/reference/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

Update the profile to align with OCDS:

* [#245](https://github.com/open-contracting-extensions/public-private-partnerships/pull/245) Remove the preQualification extension and update framework reference accordingly.
* [#243](https://github.com/open-contracting-extensions/public-private-partnerships/pull/243) Restore `buyer` and `awards/supplier` fields and associated codes. Remove `publicAuthority` and `awards/preferredBidders` fields and associated codes. Update the framework reference accordingly.
* [#244](https://github.com/open-contracting-extensions/public-private-partnerships/pull/244) Restore 'tender' code and remove 'ppp' code from `initiationType.csv`.

Expand Down
10 changes: 0 additions & 10 deletions docs/reference/codelists.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,6 @@ For additional guidance on using this codelist, refer to the [Requirements exten

For additional guidance on using this codelist, refer to the [Financing extension documentation](https://extensions.open-contracting.org/en/extensions/finance/master/).

#### preQualificationStatus

```eval_rst
.. csv-table-no-translate::
:header-rows: 1
:file: ../_static/patched/codelists/preQualificationStatus.csv
```

For additional guidance on using this codelist, refer to the [Qualification extension documentation](https://extensions.open-contracting.org/en/extensions/qualification/master/).

#### relatesTo

```eval_rst
Expand Down
12 changes: 6 additions & 6 deletions docs/timing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Stages

Information about a Public Private Partnership project will become available at many different stages.
Information about a Public Private Partnership project will become available at many different stages.

The reference page includes information about the stage at which certain information should be made available.
The reference page includes information about the stage at which certain information should be made available.

OCDS is designed to support real-time publication of information, so within each stage there may be multiple points where new or updated information is available. Each time information is provided, we call this an OCDS 'release'.

Expand Down Expand Up @@ -44,17 +44,17 @@ A PPP process is likely to involve the stages below, the following release ident
<td width="30%">Recommended release tag</td>
</tr>
<tr>
<td>2.1 RfQ</td>
<td>2.1 First stage (all procedures)</td>
<td>2.1.X</td>
<td>qualification</td>
<td>tender</td>
</tr>
<tr>
<td>2.2 Shortlist</td>
<td>2.2.X</td>
<td>shortlist</td>
<td>tenderUpdate</td>
</tr>
<tr>
<td>3.1 Tender</td>
<td>3.1 Second stage (multi-stage procedures)</td>
<td>3.1.X</td>
<td>tender</td>
</tr>
Expand Down
6 changes: 0 additions & 6 deletions include/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,3 @@ compile:
pybabel compile --use-fuzzy -d $(LOCALE_DIR) -D $(DOMAIN_PREFIX)codelists

# Put local targets below.

# Update example files.
.PHONY: update_examples
update_examples:
curl -Ss -o docs/examples/full.json https://raw.githubusercontent.com/open-contracting/ocds-show-ppp/master/example/full.json
curl -Ss -o docs/examples/full_record_package.json https://raw.githubusercontent.com/open-contracting/ocds-show-ppp/master/example/full_record_package.json
2 changes: 0 additions & 2 deletions schema/patched/codelists/partyRole.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ payer,Payer,A party making a payment from a transaction.,OCDS Core
payee,Payee,A party in receipt of a payment from a transaction.,OCDS Core
reviewBody,Review body,A party responsible for the review of this procurement process. This party often has a role in any challenges made to the contract award.,OCDS Core
interestedParty,Interested party,"A party that has expressed an interest in the contracting process: for example, by purchasing tender documents or submitting clarification questions.",OCDS Core
qualifiedBidder,Qualified bidder,Those parties invited to submit a proposal in response to a Request for Proposal (RFP) for a project in which the government only allows a limited number of pre-qualified bidders to proceed to the RFP phase.,Qualification
disqualifiedBidder,Disqualified bidder,A bidder which either did not pass the qualification stage of the evaluation process or did not pass the pre-qualification stage of the process.,Qualification
bidder,Bidder,"The company or a group of companies, such as a consortium, that submits a bid in response to a RFP. A bidder could be a single party or a consortium of parties, each responsible for a specific element, such as constructing the infrastructure, supplying the equipment, or operating the business.",OCDS for PPPs Extension
privateParty,Private party,"The counter party of the procuring authority in the PPP contract. A private entity which has been granted the contract to construct and operate a government asset, and which is usually created under the form of a Special Purpose Vehicle or SPV.",OCDS for PPPs Extension
leadBank,Lead bank,A lead bank is a bank that oversees the arrangement of a loan syndication,OCDS for PPPs Extension
Expand Down
6 changes: 0 additions & 6 deletions schema/patched/codelists/preQualificationStatus.csv

This file was deleted.

6 changes: 0 additions & 6 deletions schema/patched/codelists/releaseTag.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,3 @@ implementation,Implementation,Providing new information on the implementation of
implementationUpdate,Implementation update,Updating existing information provided about the implementation of a contracting process.,OCDS Core
contractTermination,Contract termination,Providing information at the end of a contracting process.,OCDS Core
compiled,Compiled record,"This tag is used only in compiled records, which have merged together multiple releases to provide a snapshot view of the contract, and a version history.",OCDS Core
qualification,Qualification,Providing information about a new pre-qualification process (to qualify or pre-select bidders for a tender process).,OCDS for PPPs Extension
qualificationUpdate,Qualification update,"An update to an existing qualification release. There should be at least one qualification release with the same ocid, but an earlier releaseDate, before a qualificationUpdate is published. An update may add new information or make corrections to prior published information. It should not be used for formal legal amendments to a pre-qualification process, for which the qualificationAmendment tag should be used.",OCDS for PPPs Extension
qualificationAmendment,Qualification amendment,"An amendment to an existing qualification release. There should be at least one qualification release with the same ocid, but an earlier releaseDate, before a qualificationAmendment is published. The term amendment has legal meaning in many jurisdictions.",OCDS for PPPs Extension
qualificationCancellation,Qualification cancellation,"The cancellation of an existing pre-qualification process. There should be at least one release with the same ocid, but an earlier releaseDate, which provides details of the pre-qualification process being cancelled.",OCDS for PPPs Extension
shortlist,Shortlist,"Providing information about the qualification or pre-selection of bidders. The preQualification section may be populated with details of the process leading up to the shortlist, and details of qualified or shortlisted bidders will be provided in the parties section.",OCDS for PPPs Extension
shortlistUpdate,Shortlist update,"An update to an existing shortlist release. There should be at least one shortlist release with the same ocid, but an earlier releaseDate before an shortlistUpdate is published. An update may add new information or make corrections.",OCDS for PPPs Extension
211 changes: 2 additions & 209 deletions schema/patched/release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"tag": {
"title": "Release Tag",
"description": "One or more values from the closed [releaseTag](https://standard.open-contracting.org/profiles/ppp/latest/{{lang}}/reference/codelists/#releasetag) codelist. Tags can be used to filter releases and to understand the kind of information that releases might contain.",
"description": "One or more values from the closed [releaseTag](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#release-tag) codelist. Tags can be used to filter releases and to understand the kind of information that releases might contain.",
"type": "array",
"items": {
"type": "string",
Expand All @@ -47,13 +47,7 @@
"implementation",
"implementationUpdate",
"contractTermination",
"compiled",
"qualification",
"qualificationUpdate",
"qualificationAmendment",
"qualificationCancellation",
"shortlist",
"shortlistUpdate"
"compiled"
]
},
"codelist": "releaseTag.csv",
Expand Down Expand Up @@ -151,11 +145,6 @@
"null"
],
"description": "An overall description for this contracting process or release. This should not replace provision of a detailed breakdown of the objects of the contracting process in the planning, tender, award or contracts section."
},
"preQualification": {
"title": "Pre-qualification",
"description": "The activities undertaken in order to qualify suppliers to participate in the tender.",
"$ref": "#/definitions/PreQualification"
}
},
"required": [
Expand Down Expand Up @@ -3361,202 +3350,6 @@
},
"minProperties": 1
},
"PreQualification": {
"title": "Pre-qualification",
"description": "Data regarding pre-qualification process - limiting the number of qualified bidders by reviewing each bidder's qualifications against a set of criteria.",
"type": "object",
"required": [
"id"
],
"properties": {
"id": {
"title": "Pre-qualification ID",
"description": "An identifier for this pre-qualification process. This may be the same as the ocid, or may be drawn from an internally held identifier for this process.",
"type": [
"string",
"integer"
],
"minLength": 1
},
"title": {
"title": "Pre-qualification title",
"description": "Pre-qualification title",
"type": [
"string",
"null"
],
"minLength": 1
},
"description": {
"title": "Pre-qualification description",
"description": "Pre-qualification description",
"type": [
"string",
"null"
],
"minLength": 1
},
"status": {
"title": "Pre-qualification status",
"description": "The current status of the pre-qualification.",
"type": [
"string",
"null"
],
"codelist": "preQualificationStatus.csv",
"openCodelist": false,
"enum": [
"planned",
"active",
"cancelled",
"unsuccessful",
"complete",
null
]
},
"submissionMethod": {
"title": "Submission method",
"description": "The methods by which bids are submitted.",
"type": [
"array",
"null"
],
"items": {
"type": "string",
"minLength": 1
},
"codelist": "submissionMethod.csv",
"openCodelist": true,
"uniqueItems": true,
"minItems": 1
},
"submissionMethodDetails": {
"title": "Submission method details",
"description": "Any detailed or further information on the submission method. This may include the address, e-mail address or online service to which bids should be submitted, and any special requirements to be followed for submissions.",
"type": [
"string",
"null"
],
"minLength": 1
},
"period": {
"title": "Pre-qualification period",
"description": "The period when the pre-qualification is open for submissions. The end date is the closing date for pre-qualification submissions.",
"$ref": "#/definitions/Period"
},
"enquiryPeriod": {
"title": "Enquiry period",
"description": "The period during which enquiries regarding the pre-qualification may be made and answered.",
"$ref": "#/definitions/Period"
},
"hasEnquiries": {
"title": "Has enquiries?",
"description": "A true/false field to indicate whether any enquiries were received during the pre-qualification process",
"type": [
"boolean",
"null"
]
},
"eligibilityCriteria": {
"title": "Eligibility criteria",
"description": "A description of any eligibility criteria for bidders to participate in the pre-qualification.",
"type": [
"string",
"null"
],
"minLength": 1
},
"qualificationPeriod": {
"title": "Qualification period",
"description": "The date or period when candidates will are anticipated to be qualified or pre-selected (shortlisted).",
"$ref": "#/definitions/Period"
},
"numberOfTenderers": {
"title": "Number of tenderers",
"description": "The number of entities who submit a response to the pre-qualification.",
"type": [
"integer",
"null"
]
},
"tenderers": {
"title": "Tenderers",
"description": "All entities who submit a response to the pre-qualification.",
"type": "array",
"items": {
"$ref": "#/definitions/OrganizationReference"
},
"uniqueItems": true,
"minItems": 1
},
"procuringEntity": {
"title": "Procuring entity",
"description": "The entity managing the procurement, which may be different from the buyer who is paying / using the items being procured.",
"$ref": "#/definitions/OrganizationReference"
},
"documents": {
"title": "Documents",
"description": "All documents and attachments related to the pre-qualification, including any notices. See the `documentType.csv` codelist for details of potential documents to include.",
"type": "array",
"items": {
"$ref": "#/definitions/Document"
},
"uniqueItems": true,
"minItems": 1
},
"milestones": {
"title": "Milestones",
"description": "A list of milestones associated with the pre-qualification.",
"type": "array",
"items": {
"$ref": "#/definitions/Milestone"
},
"uniqueItems": true,
"minItems": 1
},
"amendments": {
"description": "An amendment is a formal change to the pre-qualification process, and generally involves the publication of a new RFQ notice/release. The rationale and a description of the changes made can be provided here.",
"type": "array",
"title": "Amendments",
"items": {
"$ref": "#/definitions/Amendment"
},
"uniqueItems": true,
"minItems": 1
}
},
"patternProperties": {
"^(title_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$": {
"type": [
"string",
"null"
],
"minLength": 1
},
"^(description_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$": {
"type": [
"string",
"null"
],
"minLength": 1
},
"^(submissionMethodDetails_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$": {
"type": [
"string",
"null"
],
"minLength": 1
},
"^(eligibilityCriteria_(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)))$": {
"type": [
"string",
"null"
],
"minLength": 1
}
},
"minProperties": 1
},
"Criterion": {
"type": "object",
"title": "Criterion",
Expand Down
2 changes: 0 additions & 2 deletions schema/profile/codelists/+partyRole.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
Code,Title,Description,Source
qualifiedBidder,Qualified bidder,Those parties invited to submit a proposal in response to a Request for Proposal (RFP) for a project in which the government only allows a limited number of pre-qualified bidders to proceed to the RFP phase.,https://ppp-certification.com/ppp-certification-guide/glossary
disqualifiedBidder,Disqualified bidder,A bidder which either did not pass the qualification stage of the evaluation process or did not pass the pre-qualification stage of the process.,
bidder,Bidder,"The company or a group of companies, such as a consortium, that submits a bid in response to a RFP. A bidder could be a single party or a consortium of parties, each responsible for a specific element, such as constructing the infrastructure, supplying the equipment, or operating the business.",https://ppp-certification.com/ppp-certification-guide/glossary
privateParty,Private party,"The counter party of the procuring authority in the PPP contract. A private entity which has been granted the contract to construct and operate a government asset, and which is usually created under the form of a Special Purpose Vehicle or SPV.",https://ppp-certification.com/ppp-certification-guide/glossary
leadBank,Lead bank,A lead bank is a bank that oversees the arrangement of a loan syndication,
Expand Down