pool/python-merge3
SHA256
17
0
Fork 2
Code Issues Pull Requests Activity

Compare commits

merge into: pool:factory
Branches Tags
pool:factory pool:leap-16.0 pool:devel python:main
...
pull from: python:main
Branches Tags
python:main pool:factory pool:leap-16.0 pool:devel

2 Commits
factory ... main

Author SHA256 Message Date
Ana Guerrero
49c75816f6 Accepting request 1224132 from devel:languages:python 
OBS-URL: https://build.opensuse.org/request/show/1224132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-merge3?expand=0&rev=4
 2024-11-14 15:10:06 +00:00
Dirk Mueller
18fc71d2d1 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
 2024-11-14 09:37:19 +00:00
4 changed files with 14 additions and 5 deletions
Expand all files Collapse all files

3
merge3-0.0.14.tar.gz
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

9
python-merge3.changes
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> Mon Mar 25 20:07:15 UTC 2024 - Dirk Müller <dmueller@suse.com>

4
python-merge3.spec
View File

@@ -18,12 +18,12 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-merge3 Name: python-merge3
Version: 0.0.14 Version: 0.0.15
Release: 0 Release: 0
Summary: Python implementation of 3-way merge Summary: Python implementation of 3-way merge
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://github.com/breezy-team/merge3 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 pip}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}