forked from pool/python-datadiff
Markéta Machová
52c0b8df45
- Update to version 2.2.0: * Bump version * Removed separate version file now that Setuptools can read without importing. * Ran ruff --fix to clean up some lint. * Remove LICENSE from MANIFEST.in (Setuptools includes it by default now). * Add a pyproject.toml for better packaging support. * Mark failing tests as xfail until someone can investigate. * Moved package metadata to declarative setup.cfg * Remove tests_require * Remove superfluous license field * Remove commented code for deprecated usage. * Port test runner to nose. - added patches https://sourceforge.net/p/datadiff/code/merge-requests/3/ + python-datadiff-no-six.patch OBS-URL: https://build.opensuse.org/request/show/1114962 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-datadiff?expand=0&rev=6
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
diff --git a/datadiff/tests/test_datadiff.py b/datadiff/tests/test_datadiff.py
|
|
index 83f39e6..f30b340 100644
|
|
--- a/datadiff/tests/test_datadiff.py
|
|
+++ b/datadiff/tests/test_datadiff.py
|
|
@@ -5,7 +5,6 @@ from datetime import datetime
|
|
from unittest.case import SkipTest
|
|
|
|
import pytest
|
|
-import six
|
|
|
|
from datadiff import diff, DataDiff, NotHashable, DiffNotImplementedForType, DiffTypeError
|
|
|
|
@@ -43,20 +42,6 @@ def test_diff_multiline_strings():
|
|
assert str(d) == expected
|
|
|
|
|
|
-def test_diff_unicode_vs_str():
|
|
- if six.PY3:
|
|
- raise SkipTest("Unicode and bytes are different types")
|
|
- d = diff(u'abc\ndef\nghi', b'abc\nghi', fromfile="x", tofile="y")
|
|
- expected = dedent('''\
|
|
- --- x
|
|
- +++ y
|
|
- @@ -1,3 +1,2 @@
|
|
- abc
|
|
- -def
|
|
- ghi''')
|
|
- assert str(d) == expected
|
|
-
|
|
-
|
|
def test_diff_list():
|
|
a = [1, 'xyz', 2, 3, 4, 5]
|
|
b = [1, 'abc', 2, 4, 6]
|
|
diff --git a/tox.ini b/tox.ini
|
|
index b9d77fc..b9c446a 100644
|
|
--- a/tox.ini
|
|
+++ b/tox.ini
|
|
@@ -6,7 +6,6 @@ setenv = PYTHONHASHSEED=0
|
|
deps =
|
|
coverage
|
|
pytest
|
|
- six
|
|
commands = coverage run --source=datadiff --branch --parallel-mode {envbindir}/pytest
|
|
|
|
|
|
|