Skip to content

Commit 5e6ace4

Browse files
authored
Merge branch 'dev' into pretty-view
2 parents e1d076e + d711b4e commit 5e6ace4

18 files changed

+1378
-87
lines changed

AUTHORS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- Seperman
22
- Victor Hahn Castell @ Flexoptix
33

4-
And many thanks to the following people for their contributions to DeepDiff:
4+
And many thanks to the following people for their contributions to DeepDiff in the order of contribution time:
55

66
- nfvs for Travis-CI setup script.
77
- brbsix for initial Py3 porting.
@@ -26,3 +26,4 @@ And many thanks to the following people for their contributions to DeepDiff:
2626
- Hugo (hugovk) for fixes for Python 3.10 and dropping support for EOL Python 3.4
2727
- Andrey Gavrilin (gaal-dev) for hashing classes.
2828
- Ivan Piskunov (van-ess0) for deprecation warning enhancement.
29+
- Nathaniel Brown (nathanielobrown) Adds support for datetime.time

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 - 2016 Sep Ehr (Seperman) and contributors
3+
Copyright (c) 2014 - 2020 Sep Dehpour (Seperman) and contributors
44
www.zepworks.com
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ And then running
417417

418418
# ChangeLog
419419

420+
- v5-0-0: Introducing the Delta object
421+
- v4-3-3: Adds support for datetime.time
420422
- v4-3-2: Deprecation Warning Enhancement
421423
- v4-3-1: Fixing the issue with exclude_path and hash calculations when dictionaries were inside iterables. https://github.com/seperman/deepdiff/issues/174
422424
- v4-3-0: adding exclude_obj_callback
@@ -475,7 +477,7 @@ git push && git push --tags
475477
# Contribute
476478

477479
1. Please make your PR against the dev branch
478-
2. Please make sure that your PR has tests. Since DeepDiff is used in many sensitive data driven projects, we maintain 100% test coverage on the code. There are occasiannly exceptions to that rule but that is rare.
480+
2. Please make sure that your PR has tests. Since DeepDiff is used in many sensitive data driven projects, we maintain 100% test coverage on the code.
479481

480482
Thank you!
481483

deepdiff/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""This module offers the DeepDiff, DeepSearch, grep and DeepHash classes."""
1+
"""This module offers the DeepDiff, DeepSearch, grep, Delta and DeepHash classes."""
22
# flake8: noqa
33
__version__ = '4.3.2'
44
import logging
@@ -10,3 +10,4 @@
1010
from .diff import DeepDiff
1111
from .search import DeepSearch, grep
1212
from .deephash import DeepHash
13+
from .delta import Delta

0 commit comments

Comments
 (0)