diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c3352fb..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016 Yusuke Tsutsumi - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/deepmerge-0.1.0.tar.gz b/deepmerge-0.1.0.tar.gz deleted file mode 100644 index 0e546c3..0000000 --- a/deepmerge-0.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d37f739e74e8a284ee0bd683daaef88acc8438ba048545aefb87ade695a2a34 -size 5228 diff --git a/deepmerge-1.1.0.tar.gz b/deepmerge-1.1.0.tar.gz new file mode 100644 index 0000000..bee048f --- /dev/null +++ b/deepmerge-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c27a0db5de285e1a7ceac7dbc1531deaa556b627dea4900c8244581ecdfea2d +size 17785 diff --git a/python-deepmerge.changes b/python-deepmerge.changes index 2e9292b..20eba9c 100644 --- a/python-deepmerge.changes +++ b/python-deepmerge.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 diff --git a/python-deepmerge.spec b/python-deepmerge.spec index 2d6c61e..0996ae1 100644 --- a/python-deepmerge.spec +++ b/python-deepmerge.spec @@ -1,7 +1,7 @@ # # spec file for package python-deepmerge # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 +%{?sle15_python_module_pythons} Name: python-deepmerge -Version: 0.1.0 +Version: 1.1.0 Release: 0 License: MIT Summary: A toolset to deeply merge python dictionaries -Url: http://deepmerge.readthedocs.io/en/latest/ +URL: https://github.com/toumorokoshi/deepmerge Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/d/deepmerge/deepmerge-%{version}.tar.gz -Source99: https://raw.githubusercontent.com/toumorokoshi/deepmerge/master/LICENSE -BuildRequires: python-rpm-macros +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 pytest} +BuildRequires: %{python_module wheel} BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildArch: noarch %python_subpackages @@ -40,13 +42,12 @@ Python module to deeply merge python dictionaries. %prep %setup -q -n deepmerge-%{version} -cp %{S:99} . %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -55,6 +56,7 @@ cp %{S:99} . %files %{python_files} %doc README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/deepmerge +%{python_sitelib}/deepmerge-%{version}.dist-info/ %changelog