remove preQualification extension, update framework reference

open-contracting-extensions / public-private-partnerships

OCDS for Public Private Partnerships (PPPs)

http://standard.open-contracting.org/profiles/ppp/latest/en/

Other

5 stars 3 forks source link

remove preQualification extension, update framework reference #245

Closed duncandewhurst closed 3 years ago

duncandewhurst commented 3 years ago

Closes #217

TO-DO:

[x] Finalise II.2 (list of pre-qualified suppliers) guidance
[x] Update spreadsheet template
[x] Update examples
[x] Update disclosure timing tables in section II
~~Update examples in the ocds-show repository, copy the files to the ocds-show-ppp repository, and then run make update_examples~~
[ ] Update spreadsheet template and worked example URLs

jpmckinney commented 3 years ago

There are a lot of conflicts with 1.0-dev (possibly because this PR also makes whitespace changes). You might want to restart the PR.

jpmckinney commented 3 years ago

Changes ignoring whitespace: https://github.com/open-contracting-extensions/public-private-partnerships/pull/245/files?w=1

jpmckinney commented 3 years ago

There are a lot of conflicts with 1.0-dev (possibly because this PR also makes whitespace changes). You might want to restart the PR.

Just checking that you're confident you can resolve all conflicts, before adding more commits?

duncandewhurst commented 3 years ago

There are a lot of conflicts with 1.0-dev (possibly because this PR also makes whitespace changes). You might want to restart the PR.

Just checking that you're confident you can resolve all conflicts, before adding more commits?

Thanks for the reminder, resolved in https://github.com/open-contracting-extensions/public-private-partnerships/pull/245/commits/0ba067b8164ce840f013abf71d901381b7767eb8

duncandewhurst commented 3 years ago

@jpmckinney this is now ready for review.

Given that I only remembered about the instructions in the readme after updating the examples directly in this repo, I thought it best for you to check you're happy with the updates in this PR, after which I'll go through the steps to update them in the ocds-show and ocds-show-ppp repositories.

Similarly, I've updated a copy of the spreadsheet template but I'll wait to update the URLs in the documentation until you've checked you're happy with the changes in this PR.

jpmckinney commented 3 years ago

Given that I only remembered about the instructions in the readme after updating the examples directly in this repo, I thought it best for you to check you're happy with the updates in this PR, after which I'll go through the steps to update them in the ocds-show and ocds-show-ppp repositories.

That's fine - as long as we keep it all in sync to avoid overwriting changes in future.

duncandewhurst commented 3 years ago

Can you summarize the significant changes to the JSON files? They're hard to review.

I should've mentioned that I used OCDS Kit to generate full_record_package.json from full.json so only the latter requires a detailed review.

The main change is to adapt the example to reflect the changes to the framework reference.

Besides that, I fixed some issues:

Use American spelling of 'Fiber'
Correct identifiers which were incorrectly converted to numbers
Correct inconsistent release dates
Correct inconsistent timezones
Reduce repetition between releases to make the example easier to maintain
Use sequential identifiers rather than '123456'
Add name to unit

In the course of the updates parties/identifier/id and parties/identifier/scheme were reordered for some reason.

jpmckinney commented 3 years ago

Thanks! full.json is a bit long to review, so I'll trust the changes based on your description.

jpmckinney commented 3 years ago

Update spreadsheet template and worked example URLs

Does this need to be done in this PR, or separately?

Update examples in the ocds-show repository, copy the files to the ocds-show-ppp repository, and then run make update_examples

I'm going to have another look at this. Maybe we can just delete them from those repositories.

jpmckinney commented 3 years ago

Update examples in the ocds-show repository, copy the files to the ocds-show-ppp repository, and then run make update_examples

I'm going to have another look at this. Maybe we can just delete them from those repositories.

I've just deleted the examples from those other repositories, where they were unused.

The instruction about the examples was a hold-over from when ocds-show-ppp was entirely copied into this repository, which caused some real maintenance issues (changes here not being replicated to ocds-show or ocds-show-ppp). The examples themselves serve no purpose in those other repositories, so it's fine to edit them here only.

For reference: https://github.com/open-contracting-extensions/public-private-partnerships/pull/220