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

Conversation

duncandewhurst
Copy link
Member

@duncandewhurst duncandewhurst commented Jan 11, 2021

Closes #217

TO-DO:

  • Finalise II.2 (list of pre-qualified suppliers) guidance
  • Update spreadsheet template
  • Update examples
  • 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
Copy link
Member

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
Copy link
Member

docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
@jpmckinney
Copy link
Member

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
Copy link
Member Author

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 0ba067b

@duncandewhurst duncandewhurst marked this pull request as ready for review February 3, 2021 04:55
@duncandewhurst
Copy link
Member Author

@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.

Copy link
Member

@jpmckinney jpmckinney left a 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.

docs/examples/full.json Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
docs/framework.md Outdated Show resolved Hide resolved
@jpmckinney
Copy link
Member

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 and others added 2 commits February 15, 2021 12:18
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
duncandewhurst and others added 3 commits February 15, 2021 12:20
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>
@duncandewhurst
Copy link
Member Author

duncandewhurst commented Feb 15, 2021

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
Copy link
Member

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

Copy-edit description of II.1.10. Quote definitions from World Bank framework. Remove lines that repeated headings.
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
@jpmckinney
Copy link
Member

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
Copy link
Member

jpmckinney commented Feb 22, 2021

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: #220

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove preQualification extension and update guidance accordingly
2 participants