Skip to content

Commit ac795e8

Browse files
authored
Merge pull request #119 from seperman/dev
DeepDiff v4.0.0
2 parents 56034a4 + 906c16d commit ac795e8

34 files changed

+3407
-3088
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
33
*.py[cod]
4+
.pytest_cache/
45

56
# C extensions
67
*.so
@@ -62,3 +63,5 @@ target/
6263
.idea/
6364
.~lock*
6465

66+
.python-version
67+

.travis.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
language: python
22

3-
python:
4-
- "2.7"
5-
- "3.3"
6-
- "3.4"
7-
- "3.5"
8-
- "3.6"
9-
- "pypy-5.4" # pypy on python 2.7
10-
# - "pypy3" # Removing pypy3 from travis since travis's pypy3 seems buggy
11-
12-
sudo: false
3+
matrix:
4+
include:
5+
- python: 3.4
6+
- python: 3.5
7+
- python: 3.6
8+
- python: pypy3
9+
- python: 3.7
10+
dist: xenial
11+
sudo: true
1312

1413
install:
15-
- pip install coveralls
14+
- pip install -r requirements-dev.txt
1615

17-
script: coverage run --source deepdiff setup.py test
16+
script: pytest --cov=deepdiff tests/
1817

1918
after_success:
2019
- coveralls

AUTHORS

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
Authors:
22
- Seperman
33
- Victor Hahn Castell @ Flexoptix
4-
5-
Also thanks to:
64
- nfvs for Travis-CI setup script.
75
- brbsix for initial Py3 porting.
86
- WangFenjin for unicode support.
@@ -15,3 +13,10 @@ Also thanks to:
1513
- movermeyer for updating docs
1614
- maxrothman for search in inherited class attributes
1715
- maxrothman for search for types/objects
16+
- MartyHub for exclude regex paths
17+
- sreecodeslayer for DeepSearch match_string
18+
- Brian Maissy (brianmaissy) for weakref fix, enum tests
19+
- Bartosz Borowik (boba-2) for Exclude types fix when ignoring order
20+
- Brian Maissy (brianmaissy) for fixing classes which inherit from classes with slots didn't have all of their slots compared
21+
- Juan Soler (Soleronline) for adding ignore_type_number
22+
- mthaddon for adding timedelta diffing support

0 commit comments

Comments
 (0)