From 425450fc6faf34b1130a8070edff3ed0466b62b7d2e3d92280306ac18c9503de Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 3 Apr 2021 09:58:21 +0000 Subject: [PATCH] Accepting request 882652 from home:bnavigator:branches:devel:languages:python - Update to 5.2.3 * Retaining the order of multiple dictionary items added via Delta. * Fixed the typo with yml files in deep cli. * Fixing Grep RecursionError where using non UTF-8 character. * Allowing kwargs to be passed to to_json method. - Release 5.2.2 * Fixed Delta serialization when None type is present. - Release 5.2.0 * Removed Murmur3 as the preferred hashing method. Using SHA256 by default now. * Added commandline for deepdiff. * Added group_by. * Added math_epsilon. * Improved ignoring of NoneType. - Release 5.0.2 * Bug Fix NoneType in ignore type groups https://github.com/seperman/deepdiff/issues/207 - Release 5.0.1 * Bug fix to not apply format to non numbers. - Release 5.0.0 * Introducing the Delta object * Improving Numpy support * Fixing tuples comparison when ignore_order=True * Dramatically improving the results when ignore_order=True by running in passes * Introducing pretty print view, deep_distance, purge, progress logging, cache and truncate_datetime. * Adds support for datetime.time - Skip python36 build because the test suite makes extensive use of OBS-URL: https://build.opensuse.org/request/show/882652 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-deepdiff?expand=0&rev=11 --- 4.3.2.tar.gz | 3 --- deepdiff-5.2.3-gh.tar.gz | 3 +++ python-deepdiff.changes | 35 +++++++++++++++++++++++++++++ python-deepdiff.spec | 48 +++++++++++++++++++++++++++++++--------- 4 files changed, 75 insertions(+), 14 deletions(-) delete mode 100644 4.3.2.tar.gz create mode 100644 deepdiff-5.2.3-gh.tar.gz diff --git a/4.3.2.tar.gz b/4.3.2.tar.gz deleted file mode 100644 index ec97ec3..0000000 --- a/4.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:225b7ee0ab6640d6485e8b47a67b4ddb37c6766f685798d93c0fa44be432a7e6 -size 73092 diff --git a/deepdiff-5.2.3-gh.tar.gz b/deepdiff-5.2.3-gh.tar.gz new file mode 100644 index 0000000..c4f405f --- /dev/null +++ b/deepdiff-5.2.3-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a78596346143cc1522b45db996f67ba1cbd24cd0073bedf765ecfe06d5adf2e +size 379444 diff --git a/python-deepdiff.changes b/python-deepdiff.changes index b5c8df5..582395a 100644 --- a/python-deepdiff.changes +++ b/python-deepdiff.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Thu Apr 1 21:00:21 UTC 2021 - Ben Greiner + +- Update to 5.2.3 + * Retaining the order of multiple dictionary items added via + Delta. + * Fixed the typo with yml files in deep cli. + * Fixing Grep RecursionError where using non UTF-8 character. + * Allowing kwargs to be passed to to_json method. +- Release 5.2.2 + * Fixed Delta serialization when None type is present. +- Release 5.2.0 + * Removed Murmur3 as the preferred hashing method. Using SHA256 by + default now. + * Added commandline for deepdiff. + * Added group_by. + * Added math_epsilon. + * Improved ignoring of NoneType. +- Release 5.0.2 + * Bug Fix NoneType in ignore type groups + https://github.com/seperman/deepdiff/issues/207 +- Release 5.0.1 + * Bug fix to not apply format to non numbers. +- Release 5.0.0 + * Introducing the Delta object + * Improving Numpy support + * Fixing tuples comparison when ignore_order=True + * Dramatically improving the results when ignore_order=True by + running in passes + * Introducing pretty print view, deep_distance, purge, + progress logging, cache and truncate_datetime. + * Adds support for datetime.time +- Skip python36 build because the test suite makes extensive use of + NumPy. + ------------------------------------------------------------------- Thu Apr 2 10:36:40 UTC 2020 - Marketa Calabkova diff --git a/python-deepdiff.spec b/python-deepdiff.spec index 88a594d..1560866 100644 --- a/python-deepdiff.spec +++ b/python-deepdiff.spec @@ -1,7 +1,7 @@ # # spec file for package python-deepdiff # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,36 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 +%define skip_python36 1 Name: python-deepdiff -Version: 4.3.2 +Version: 5.2.3 Release: 0 Summary: Deep Difference and Search of any Python object/data License: MIT URL: https://github.com/seperman/deepdiff -Source: https://github.com/seperman/deepdiff/archive/%{version}.tar.gz +Source: https://github.com/seperman/deepdiff/archive/%{version}.tar.gz#/deepdiff-%{version}-gh.tar.gz +BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module click} BuildRequires: %{python_module jsonpickle} -BuildRequires: %{python_module mock} BuildRequires: %{python_module numpy} BuildRequires: %{python_module ordered-set} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module toml} +#BuildRequires: %%{python_module clevercsv} # not available BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-jsonpickle +Requires(post): update-alternatives +Requires(postun):update-alternatives Requires: python-ordered-set +Recommends: python-clevercsv +Recommends: python-click +Recommends: python-jsonpickle +Recommends: python-numpy +Recommends: python-pyyaml +Recommends: python-toml BuildArch: noarch %python_subpackages @@ -44,22 +55,37 @@ iterables, strings and other objects. It can search for objects within other objects, and hash any object based on their content. %prep -%setup -q -n deepdiff-%{version} +%autosetup -p1 -n deepdiff-%{version} +sed -i '1{/env python/d}' deepdiff/deephash.py deepdiff/diff.py deepdiff/search.py %build %python_build %install %python_install +%python_clone -a %{buildroot}%{_bindir}/deep %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# murmur3 is optional, deepdiff uses sha256 instead -%pytest -k 'not TestDeepHashMurmur3' +# we don't have the (optional) requirement CleverCSV for csv diffing +donttest="(TestCommands and (csv or group_by)) or (test_load_path_content and csv)" +if [ $(getconf LONG_BIT) -eq 32 ]; then + # reference expects int64 where 32-bit platforms return int32 + donttest+=" or (test_numpy_delta_cases and delta_numpy7_arrays_of_different_sizes)" +fi +%pytest -k "not ($donttest)" + +%post +%python_install_alternative deep + +%postun +%python_uninstall_alternative deep %files %{python_files} %license LICENSE -%doc README.md AUTHORS -%{python_sitelib}/* +%doc README.md AUTHORS.md +%{python_sitelib}/deepdiff +%{python_sitelib}/deepdiff-%{version}*-info +%python_alternative %{_bindir}/deep %changelog