From 6a81dcce83728b09b3f3cd30ef241ec5cfb3925c449a6d282d73af94b3570187 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 28 Sep 2024 19:47:48 +0000 Subject: [PATCH] - update to 2.0: * Add typing / drop Python < 3.8 support * feat: add typing for `merge` and `value_strategy` functions * fix: Different hash for same dictionaries problem - update to 2.0b0: * minor: small doc improvement * Add typing / drop Python < 3.8 support OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-deepmerge?expand=0&rev=8 --- .gitattributes | 23 +++++++++++++++ .gitignore | 1 + deepmerge-1.1.1.tar.gz | 3 ++ deepmerge-2.0.tar.gz | 3 ++ python-deepmerge.changes | 45 +++++++++++++++++++++++++++++ python-deepmerge.spec | 62 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 137 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 deepmerge-1.1.1.tar.gz create mode 100644 deepmerge-2.0.tar.gz create mode 100644 python-deepmerge.changes create mode 100644 python-deepmerge.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/deepmerge-1.1.1.tar.gz b/deepmerge-1.1.1.tar.gz new file mode 100644 index 0000000..06cecab --- /dev/null +++ b/deepmerge-1.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53a489dc9449636e480a784359ae2aab3191748c920649551c8e378622f0eca4 +size 17960 diff --git a/deepmerge-2.0.tar.gz b/deepmerge-2.0.tar.gz new file mode 100644 index 0000000..a0a880f --- /dev/null +++ b/deepmerge-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c3d86081fbebd04dd5de03626a0607b809a98fb6ccba5770b62466fe940ff20 +size 19890 diff --git a/python-deepmerge.changes b/python-deepmerge.changes new file mode 100644 index 0000000..0ea2721 --- /dev/null +++ b/python-deepmerge.changes @@ -0,0 +1,45 @@ +------------------------------------------------------------------- +Sat Sep 28 19:46:24 UTC 2024 - Dirk Müller + +- update to 2.0: + * Add typing / drop Python < 3.8 support + * feat: add typing for `merge` and `value_strategy` functions + * fix: Different hash for same dictionaries problem +- update to 2.0b0: + * minor: small doc improvement + * Add typing / drop Python < 3.8 support + +------------------------------------------------------------------- +Tue Dec 19 09:34:58 UTC 2023 - Dirk Müller + +- update to 1.1.1: + * Fix documentation for custom strategies + * Update Python versions + * Make predefined merge strategies work with built-in + collections subtypes + +------------------------------------------------------------------- +Tue May 30 04:26:09 UTC 2023 - Johannes Kastl + +- change URL to https://github.com/toumorokoshi/deepmerge + +------------------------------------------------------------------- +Sun May 28 10:05:37 UTC 2023 - Johannes Kastl + +- update to 1.1.0: + * no changelog found upstream +- update to 1.0.1: + * no changelog found upstream +- update to 1.0.0: + * no changelog found upstream +- update to 0.3.0: + * no changelog found upstream +- update to 0.2.1: + * no changelog found upstream +- update to 0.2.0: + * no changelog found upstream + +------------------------------------------------------------------- +Mon Apr 13 15:32:28 UTC 2020 - Antonio Larrosa + +- Initial release of python-deepmerge 0.1.0 diff --git a/python-deepmerge.spec b/python-deepmerge.spec new file mode 100644 index 0000000..62882a6 --- /dev/null +++ b/python-deepmerge.spec @@ -0,0 +1,62 @@ +# +# spec file for package python-deepmerge +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{?sle15_python_module_pythons} +Name: python-deepmerge +Version: 2.0 +Release: 0 +License: MIT +Summary: A toolset to deeply merge python dictionaries +URL: https://github.com/toumorokoshi/deepmerge +Group: Development/Languages/Python +Source: https://files.pythonhosted.org/packages/source/d/deepmerge/deepmerge-%{version}.tar.gz +BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools_scm > 5} +BuildRequires: %{python_module vcver} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildArch: noarch + +%python_subpackages + +%description +Python module to deeply merge python dictionaries. + +%prep +%setup -q -n deepmerge-%{version} + +%build +%pyproject_wheel + +%install +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +%check +%pytest + +%files %{python_files} +%doc README.rst +%license LICENSE +%{python_sitelib}/deepmerge +%{python_sitelib}/deepmerge-%{version}.dist-info/ + +%changelog