diff --git a/CHANGES b/CHANGES index 25e98b3..41aa76d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,15 @@ Changes ======= +Version 0.7.0 (released 2017-10-16) + +- Fixes problem with diff results that reference the original structure by + introduction of `deepcopy` for all possibly unhashable items. Thus the diff + does not change later when the diffed structures change. +- Adds new option for patching and reverting patches in-place. +- Adds Python 3.6 to test matrix. +- Fixes the `ignore` argument when it contains a unicode value. + Version 0.6.1 (released 2016-11-22) - Changes order of items for REMOVE section of generated patches when diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst index 9e46d9e..d950f69 100644 --- a/RELEASE-NOTES.rst +++ b/RELEASE-NOTES.rst @@ -1,8 +1,8 @@ =================== - Dictdiffer v0.6.1 + Dictdiffer v0.7.0 =================== -Dictdiffer v0.6.1 was released on November 22, 2016. +Dictdiffer v0.7.0 was released on October 16, 2017. About ----- @@ -10,28 +10,33 @@ About Dictdiffer is a helper module that helps you to diff and patch dictionaries. +Incompatible changes +-------------------- + +- Fixes problem with diff results that reference the original structure by + introduction of `deepcopy` for all possibly unhashable items. Thus the diff + does not change later when the diffed structures change. + Improved features ----------------- -- Improves API documentation for `ignore` argument in `diff` function. - (#79) -- Executes doctests during PyTest invocation. +- Adds new option for patching and reverting patches in-place. +- Adds Python 3.6 to test matrix. Bug fixes --------- -- Changes order of items for REMOVE section of generated patches when - `swap` is called so the list items are removed from the end. (#85) +- Fixes the `ignore` argument when it contains a unicode value. Installation ------------ - $ pip install dictdiffer==0.6.1 + $ pip install dictdiffer==0.7.0 Documentation ------------- - http://dictdiffer.readthedocs.io/en/v0.6.1 + http://dictdiffer.readthedocs.io/en/v0.7.0 Happy hacking and thanks for flying Dictdiffer. diff --git a/dictdiffer/__init__.py b/dictdiffer/__init__.py index c389a1b..8bf0247 100644 --- a/dictdiffer/__init__.py +++ b/dictdiffer/__init__.py @@ -2,6 +2,7 @@ # # Copyright (C) 2013 Fatih Erikli. # Copyright (C) 2013, 2014, 2015, 2016 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more diff --git a/dictdiffer/merge.py b/dictdiffer/merge.py index 1840fbf..8d519a7 100644 --- a/dictdiffer/merge.py +++ b/dictdiffer/merge.py @@ -1,6 +1,7 @@ # This file is part of Dictdiffer. # # Copyright (C) 2015 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more diff --git a/dictdiffer/resolve.py b/dictdiffer/resolve.py index fe60d8c..52bfc86 100644 --- a/dictdiffer/resolve.py +++ b/dictdiffer/resolve.py @@ -1,6 +1,7 @@ # This file is part of Dictdiffer. # # Copyright (C) 2015 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more diff --git a/dictdiffer/utils.py b/dictdiffer/utils.py index 3b9aaf7..b8885e9 100644 --- a/dictdiffer/utils.py +++ b/dictdiffer/utils.py @@ -1,6 +1,7 @@ # This file is part of Dictdiffer. # # Copyright (C) 2015 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more diff --git a/dictdiffer/version.py b/dictdiffer/version.py index 797ff14..778f6a5 100644 --- a/dictdiffer/version.py +++ b/dictdiffer/version.py @@ -3,6 +3,7 @@ # This file is part of Dictdiffer. # # Copyright (C) 2014, 2015, 2016 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more @@ -17,4 +18,4 @@ # Do not change the format of this next line. Doing so risks breaking # setup.py and docs/conf.py -__version__ = "0.6.2.dev20161122" +__version__ = "0.7.0" diff --git a/tests/test_dictdiffer.py b/tests/test_dictdiffer.py index 7c852eb..b164ddc 100644 --- a/tests/test_dictdiffer.py +++ b/tests/test_dictdiffer.py @@ -4,6 +4,7 @@ # # Copyright (C) 2013 Fatih Erikli. # Copyright (C) 2013, 2014, 2015, 2016 CERN. +# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar. # # Dictdiffer is free software; you can redistribute it and/or modify # it under the terms of the MIT License; see LICENSE file for more