From 18fc71d2d1fe4685c95e7362f6cecf72f599e7d7a1b9d38c3a2318e8b6129a56 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 14 Nov 2024 09:37:19 +0000 Subject: [PATCH] Accepting request 1224092 from home:glaubitz:branches:devel:languages:python - Update to 0.0.15 * Migrate to ruff * Support building wheels * Add dependabot config - Switch upstream source from PyPi to Github OBS-URL: https://build.opensuse.org/request/show/1224092 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-merge3?expand=0&rev=7 --- merge3-0.0.14.tar.gz | 3 --- merge3-0.0.15.tar.gz | 3 +++ python-merge3.changes | 9 +++++++++ python-merge3.spec | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 merge3-0.0.14.tar.gz create mode 100644 merge3-0.0.15.tar.gz diff --git a/merge3-0.0.14.tar.gz b/merge3-0.0.14.tar.gz deleted file mode 100644 index 03ad4a2..0000000 --- a/merge3-0.0.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30406e99386f4a65280fb9c43e681890fa2a1d839cac2759d156c7cc16030159 -size 17742 diff --git a/merge3-0.0.15.tar.gz b/merge3-0.0.15.tar.gz new file mode 100644 index 0000000..a33b00b --- /dev/null +++ b/merge3-0.0.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ea80b22ad11d06f0a6d769b3a719848b28a9033899591362bad8a458bb9ef14 +size 16783 diff --git a/python-merge3.changes b/python-merge3.changes index 22f815c..11c2cb9 100644 --- a/python-merge3.changes +++ b/python-merge3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 14 08:13:30 UTC 2024 - John Paul Adrian Glaubitz + +- 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 diff --git a/python-merge3.spec b/python-merge3.spec index 2c425a2..ad91168 100644 --- a/python-merge3.spec +++ b/python-merge3.spec @@ -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}