2 Commits

4 changed files with 14 additions and 5 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30406e99386f4a65280fb9c43e681890fa2a1d839cac2759d156c7cc16030159
size 17742

3
merge3-0.0.15.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ea80b22ad11d06f0a6d769b3a719848b28a9033899591362bad8a458bb9ef14
size 16783

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 14 08:13:30 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 0.0.15
* Migrate to ruff
* Support building wheels
* Add dependabot config
- Switch upstream source from PyPi to Github
-------------------------------------------------------------------
Mon Mar 25 20:07:15 UTC 2024 - Dirk Müller <dmueller@suse.com>

View File

@@ -18,12 +18,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-merge3
Version: 0.0.14
Version: 0.0.15
Release: 0
Summary: Python implementation of 3-way merge
License: GPL-2.0-or-later
URL: https://github.com/breezy-team/merge3
Source: https://files.pythonhosted.org/packages/source/m/merge3/merge3-%{version}.tar.gz
Source: %{url}/archive/v%{version}.tar.gz#/merge3-%{version}.tar.gz
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}