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

Financing arrangements #444

Merged
merged 15 commits into from Nov 29, 2023
Merged

Financing arrangements #444

merged 15 commits into from Nov 29, 2023

Conversation

duncandewhurst
Copy link
Contributor

@duncandewhurst duncandewhurst commented Nov 22, 2023

Related issues

Description

I also reordered codelists.md so that the codelists are in alphabetical order.

Merge checklist

If there are changes to project-schema.json or project-package-schema.json:

  • Update the examples:
    • docs/examples/example.json
    • docs/examples/blank.json
  • Run ./manage.py pre-commit to update docs/_static/i8n.csv

If you added a new definition to the schema, run ./manage.py pre-commit.

If you added a new codelist:

  • Add an entry to docs/reference/codelists.md

@duncandewhurst duncandewhurst marked this pull request as ready for review November 22, 2023 02:10
@duncandewhurst
Copy link
Contributor Author

The build error should be resolved once #428 is merged and 0.9-dev is merged into this branch.

Copy link
Contributor

@odscjen odscjen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly minor copy editing to conform with the latest work in the OCDS style guide review.

Happy for you to request James' review once you've dealt with my comments

mapping/sustainability.yaml Show resolved Hide resolved
mapping/sustainability.yaml Show resolved Hide resolved
mapping/sustainability.yaml Outdated Show resolved Hide resolved
schema/project-level/codelists/financingPartyType.csv Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
@duncandewhurst
Copy link
Contributor Author

@jpmckinney just checking that this review request is on your radar. Thanks!

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.

Just a few small comments. I assume the schema is copied from the extension.

docs/cost/common.md Outdated Show resolved Hide resolved
manage.py Show resolved Hide resolved
manage.py Show resolved Hide resolved
duncandewhurst and others added 2 commits November 29, 2023 13:40
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
@duncandewhurst
Copy link
Contributor Author

I assume the schema is copied from the extension.

Yep!

I ran ocdskit schema-strict as part of resolving merge conflicts to reinstate validation keywords lost in the merge.

@duncandewhurst duncandewhurst merged commit e091176 into 0.9-dev Nov 29, 2023
10 checks passed
@duncandewhurst duncandewhurst deleted the 413-financing-arrangements branch November 29, 2023 00:58
@jpmckinney
Copy link
Member

8ca31ae seems to have removed project milestones in the merge?

@duncandewhurst
Copy link
Contributor Author

Yep, my mistake. PR to reinstate them: #456

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.

Financing arrangements
3 participants