Skip to content

global: better public API #17

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

Merged
merged 1 commit into from
Jun 22, 2016
Merged

global: better public API #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions json_merger/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,13 @@

from __future__ import absolute_import, print_function

from .dict_merger import DictMergerOps
from .list_unify import UnifierOps
from .errors import MergeError
from .merger import UpdateMerger
from .merger import ListAlignMerger, UpdateMerger
from .version import __version__

__all__ = ('__version__', 'UpdateMerger', 'MergeError')
__all__ = ('__version__',
'DictMergerOps', 'UnifierOps',
'ListAlignMerger', 'UpdateMerger',
'MergeError')
4 changes: 2 additions & 2 deletions tests/acceptance/test_merger_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

import pytest

from json_merger import UpdateMerger, MergeError
from json_merger import UnifierOps, UpdateMerger, MergeError
from json_merger.contrib.inspirehep.comparators import AuthorComparator
from json_merger.comparator import PrimaryKeyComparator

from json_merger.conflict import Conflict, ConflictType
from json_merger.list_unify import UnifierOps


class TitleComparator(PrimaryKeyComparator):
Expand Down