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.

Sign up for GitHub

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

Jump to bottom

Strengthen some normative statements in schema (wrong branch) #1069

Closed
wants to merge 76 commits into from
Closed

Strengthen some normative statements in schema (wrong branch) #1069

wants to merge 76 commits into from

Conversation

ColinMaudry
Copy link
Member

Closes #868

The goods, services, and any intangible outcomes in this contract. Note: If the items are the same as the award do not repeat.

Change second clause to either SHOULD or MUST statement.

I went for "should", as I don't believe repeating the items in the contract is harmful, just potentially confusing.

jpmckinney and others added 23 commits May 29, 2019 19:47
@jpmckinney
Merge pull request #873 from open-contracting/1.1-dev
37af115 
OCDS 1.1.4 - Bug Fix Release
@jpmckinney
Merge pull request #884 from open-contracting/1.1-dev
f7ad602 
Merge #875 from 1.1-dev onto 1.1
@jpmckinney
Merge pull request #934 from open-contracting/1.1-dev
ae6e990 
Merge 1.1-dev into 1.1
@yolile
Add personal identifiers example
160302e 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Update Personal identifiers example
5b7f09d 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@jpmckinney
Merge branch '1.1-dev' into example-personal-identifiers
fe8f3cc
@jpmckinney
Fix indentation of example
4c1f42c
@yolile
Merge branch '1.1-dev' of github.com:open-contracting/standard into e…
4fa77fa 
…xample-personal-identifiers

Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Merge branch '1.1-dev' of github.com:open-contracting/standard into e…
9d9e2a2 
…xample-personal-identifiers

Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Improve personal identifiers guidance
d772817 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@duncandewhurst
add localization docs
adf8dcf
@jpmckinney
Merge pull request #1039 from open-contracting/1.1-dev
c244abd 
Merge 1.1-dev into 1.1
@jpmckinney
Merge pull request #1056 from open-contracting/1.1-dev
af0d0d4 
Merge 1.1-dev into 1.1
@duncandewhurst
update mapping template screen, minor copy-edits
b0979ad
@duncandewhurst
correct screenshot link, crop screenshot
5549b58
@jpmckinney
Fix links
8c7e055
@jpmckinney
Merge branch '1.1-dev' into add-localization-docs
6124423
@duncandewhurst
add guidance on reusing tools
c93c40a
@duncandewhurst
Merge branch '1.1' into example-personal-identifiers
1b5ee6c
@duncandewhurst
copy-edit for grammar and clarity, add to TOC
42b77d2
@duncandewhurst
fix typo, update BODS link, add link from reference section
0ffd3fe
@ColinMaudry
Clarify role of publisher and definition of publisher name #420
6969d1a
@ColinMaudry
Strengthen some normative statements in schema #868
1e8e4c5
@jpmckinney jpmckinney changed the base branch from 1.1-dev to 1.2-dev September 16, 2020 20:06
@jpmckinney
Copy link
Member

jpmckinney commented Sep 16, 2020 •
edited
Loading

@ColinMaudry If you create the branch from this repo (rather than your fork) the tests should pass. A few other notes:

  • Please change the base branch to 1.2-dev for all new PRs (I've edited your existing PRs).
  • Add an entry to changelog.md (I forgot to do this for Clarify role of publisher and definition of publisher name #1067)
  • Set the PRs milestone to 1.2.0
  • If you edit the release schema, you'll need to run python utils/make_dereferenced_release_schema.py
  • If you add a field to the release schema, you'll need to run python utils/make_versioned_release_schema.py

yolile and others added 24 commits October 12, 2020 10:47
@yolile
Preference for string over integer identifiers
bf9f9ae 
Closes #789

Signed-off-by: Yohanna Lisnichuk <[email protected]>
@jpmckinney
Use standard.open-contracting.org instead of staging.standard.open-co…
28a45bc 
…ntracting.org
@jpmckinney
Merge pull request #1087 from open-contracting/new-staging
290a0c4 
Use standard.open-contracting.org instead of staging.standard.open-contracting.org
@jpmckinney
Merge branch '1.1-dev' into merge-1.1
7a972eb
@jpmckinney
Merge pull request #1088 from open-contracting/merge-1.1
a7f6812 
Merge 1.1-dev into 1.2-dev
@duncandewhurst
Clarify uniqueness of Organization.id
70d6e85
@duncandewhurst
Add guidance on populating Organization.id for parties without an org…
0512375 
…anization identifier
@duncandewhurst
Merge branch '1.2-dev' into 1060-parties/id-uniqueness
1638fcf
@duncandewhurst
add PR link to changelog
aa9a21b
@duncandewhurst
add link to guidance
8676c33
@duncandewhurst
Merge branch '1060-parties/id-uniqueness' of github.com:open-contract…
1d01e7d 
…ing/standard into 1060-parties/id-uniqueness
@duncandewhurst
fix broken links
1a409b3
@yolile
Merge branch '1.2-dev' of github.com:open-contracting/standard into 7…
68befbb 
…89-string-identifiers-preference
@yolile
Update changelog
59ce059 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile @jpmckinney
Update docs/history/changelog.md
c0632f7 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Replace 'schema' with 'data'
fc7b2a8 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Replace 'schema' with 'data'
465dfba 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst
clarify consistency of Organization.id across releases
85080db
@duncandewhurst
Merge pull request #1094 from open-contracting/1060-parties/id-unique…
14a0895 
…ness

1060 parties/id uniqueness
@yolile
Merge branch '1.2-dev' into 789-string-identifiers-preference
18585ab
@yolile
Merge pull request #1086 from open-contracting/789-string-identifiers…
7a4f4fd 
…-preference

String identifiers preference
@ColinMaudry
Ran util/make_dereferenced_release_schema.py
41ea3d5
@ColinMaudry
Updated changelog.md
139827c
@ColinMaudry
Ran util/make_dereferenced_release_schema.py
85d427f
@ColinMaudry ColinMaudry changed the title Strengthen some normative statements in schema #868 Strengthen some normative statements in schema (wrong branch) Nov 11, 2020
@ColinMaudry
Copy link
Member Author

Replaced this PR with #1112

@jpmckinney jpmckinney closed this Nov 11, 2020
@ColinMaudry ColinMaudry deleted the normative868 branch November 11, 2020 15:37
@jpmckinney jpmckinney removed this from the 1.2.0 milestone Jul 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpmckinney jpmckinney jpmckinney left review comments

Assignees

@ColinMaudry ColinMaudry

Labels
None yet
Projects
OCDS 1.2
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Strengthen some normative statements in schema
5 participants
@ColinMaudry @jpmckinney @yolile @duncandewhurst @odscrachel