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
Conversation
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. |
Changes ignoring whitespace: https://github.com/open-contracting-extensions/public-private-partnerships/pull/245/files?w=1 |
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Just checking that you're confident you can resolve all conflicts, before adding more commits? |
…solve merge conflicts
Thanks for the reminder, resolved in 0ba067b |
update pre-qualification modelling, generate from input template, correct identifiers, add missing fields, remove some repeated fields, correct timezones, use american spelling
@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 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you summarize the significant changes to the JSON files? They're hard to review.
That's fine - as long as we keep it all in sync to avoid overwriting changes in future. |
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
I should've mentioned that I used OCDS Kit to generate The main change is to adapt the example to reflect the changes to the framework reference. Besides that, I fixed some issues:
In the course of the updates |
Thanks! |
Copy-edit description of II.1.10. Quote definitions from World Bank framework. Remove lines that repeated headings.
bcec9e6
to
ef0651d
Compare
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Does this need to be done in this PR, or separately?
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: #220 |
Closes #217
TO-DO:
Update examples in theocds-show
repository, copy the files to theocds-show-ppp
repository, and then runmake update_examples