Skip to content

Commit

Permalink
Dictdiffer v0.4.0
Browse files Browse the repository at this point in the history
Reviewed-by: Tibor Simko <tibor.simko@cern.ch>
Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>
  • Loading branch information
jirikuncar committed Mar 11, 2015
1 parent eeab761 commit fd813ee
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 16 deletions.
8 changes: 8 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changes
=======

Version 0.4.0 (released 2015-03-11)

- Adds support for diffing and patching of sets. (#44)
- New tests for diff on the same lists. (#48)
- Fix for exception when dict has unicode keys and ignore parameter is
provided. (#50)
- PEP8 improvements.

Version 0.3.0 (released 2014-11-05):

- Adds ignore argument to `diff` function that allows skipping check
Expand Down
15 changes: 8 additions & 7 deletions RELEASE-NOTES.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
===============================
Dictdiffer v0.3.0 is released
Dictdiffer v0.4.0 is released
===============================

Dictdiffer v0.3.0 was released on November 5, 2014.
Dictdiffer v0.4.0 was released on March 11, 2015.

About
-----
Expand All @@ -13,10 +13,11 @@ dictionaries.
What's new
----------

- Adds ignore argument to `diff` function that allows skipping check
on specified keys. (#34 #35)
- Fix for diffing of dict or list subclasses. (#37)
- Better instance checking of diffing objects. (#39)
- Adds support for diffing and patching of sets. (#44)
- New tests for diff on the same lists. (#48)
- Fix for exception when dict has unicode keys and ignore parameter is
provided. (#50)
- PEP8 improvements.

Installation
------------
Expand All @@ -26,7 +27,7 @@ Installation
Documentation
-------------

http://dictdiffer.readthedocs.org/en/v0.3.0
http://dictdiffer.readthedocs.org/en/v0.4.0

Good luck and thanks for using Dictdiffer.

Expand Down
7 changes: 5 additions & 2 deletions dictdiffer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,16 @@ def diff(first, second, node=None, ignore=None):
>>> list(result)
[('change', 'a', ('b', 'c'))]
:param first: original dictionary or list
:param second: new dictionary or list
:param first: original dictionary, list or set
:param second: new dictionary, list or set
:param node: key for comparison that can be used in :func:`dot_lookup`
:param ignore: list of keys that should not be checked
.. versionchanged:: 0.3
Added *ignore* parameter.
.. versionchanged:: 0.4
Arguments ``first`` and ``second`` can now contain a ``set``.
"""
node = node or []
if all(map(lambda x: isinstance(x, string_types), node)):
Expand Down
8 changes: 4 additions & 4 deletions dictdiffer/version.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# -*- coding: utf-8 -*-
#
# This file is part of Dictdiffer.
#
# Copyright (C) 2014 CERN.
# Copyright (C) 2014, 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.

"""
Version information for dictdiffer package.
"""Version information for dictdiffer package.
This file is imported by ``dictdiffer.__init__``, and parsed by
``setup.py`` as well as ``docs/conf.py``.
Expand All @@ -17,4 +17,4 @@
# Do not change the format of this next line. Doing so risks breaking
# setup.py and docs/conf.py

__version__ = "0.4.0.dev20141208"
__version__ = "0.4.0"
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2014 CERN.
# Copyright (C) 2014, 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.

"""Dictdiffer is a library that helps you to diff and patch dictionaries."""

import os
import re
import sys
Expand Down Expand Up @@ -58,8 +60,7 @@ def run_tests(self):
setup(
name='dictdiffer',
version=version,
description='Dictdiffer is a helper module that helps you '
'to diff and patch dictionaries',
description=__doc__,
author='Invenio Collaboration',
author_email='info@invenio-software.org',
url='https://github.com/inveniosoftware/dictdiffer',
Expand Down

0 comments on commit fd813ee

Please sign in to comment.