Skip to content

Commit

Permalink
Merge 66d2352 into c75ad3b
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Nov 27, 2018
2 parents c75ad3b + 66d2352 commit 46554a1
Show file tree
Hide file tree
Showing 44 changed files with 1,430 additions and 635 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ install:
- pip install .[test]
script:
- curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
- pytest --cov ocdsmerge
- pytest -rs --cov ocdsmerge
after_success:
coveralls
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,23 @@

## 0.5

### Advisories

* Behavior is undefined and inconsistent if an array is not defined in the schema and contains objects in some releases but not in others.
* If an array sets `wholeListMerge`, `omitWhenMerged` is ignored on its sub-properties.
* If an array doesn't set `wholeListMerge` and objects have the same `id` in one release, only the last object is retained.

### Added

* Allow specifying cached or customized merge rules.
* Allow specifying a custom schema as parsed JSON.

### Fixed

* If `omitWhenMerged`, `versionId`, `wholeListMerge` were `false`, they were treated as `true`.
* If `omitWhenMerged` were set on an array of non-objects, the list wouldn't be omitted.
* If `wholeListMerge` were set on an object, only the latest version of the object would be retained in the compiled release.
* If an array were mixing objects and non-objects, the identifier merge strategy would sometimes be used instead of the whole list merge strategy.

## 0.4 (2018-01-04)

Expand Down

0 comments on commit 46554a1

Please sign in to comment.