From 0102793aca711a5fc4e9c89a26c4cdcdf628e53812fec4706b4a20f6a184df51 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 19 Dec 2023 09:40:57 +0000 Subject: [PATCH] - update to 1.1.1: * Fix documentation for custom strategies * Update Python versions * Make predefined merge strategies work with built-in collections subtypes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-deepmerge?expand=0&rev=6 --- deepmerge-1.1.0.tar.gz | 3 --- deepmerge-1.1.1.tar.gz | 3 +++ python-deepmerge.changes | 9 +++++++++ python-deepmerge.spec | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 deepmerge-1.1.0.tar.gz create mode 100644 deepmerge-1.1.1.tar.gz diff --git a/deepmerge-1.1.0.tar.gz b/deepmerge-1.1.0.tar.gz deleted file mode 100644 index bee048f..0000000 --- a/deepmerge-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c27a0db5de285e1a7ceac7dbc1531deaa556b627dea4900c8244581ecdfea2d -size 17785 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/python-deepmerge.changes b/python-deepmerge.changes index 20eba9c..f3a4b7a 100644 --- a/python-deepmerge.changes +++ b/python-deepmerge.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/python-deepmerge.spec b/python-deepmerge.spec index 0996ae1..5350ddc 100644 --- a/python-deepmerge.spec +++ b/python-deepmerge.spec @@ -18,17 +18,17 @@ %{?sle15_python_module_pythons} Name: python-deepmerge -Version: 1.1.0 +Version: 1.1.1 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 setuptools} BuildRequires: %{python_module vcver} BuildRequires: %{python_module wheel} BuildRequires: fdupes