python/python-merge3
SHA256
14
0
Fork 0
forked from pool/python-merge3
Code Pull Requests Activity

Accepting request 1161548 from devel:languages:python

Browse Source 
- update to 0.0.14:
  * migrate to pyproject.toml
  * use disperse action
  * ruff, pyupgrade
  * add merge3 helper
  * sort imports with isort
  * add python 3.11 support

OBS-URL: https://build.opensuse.org/request/show/1161548
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-merge3?expand=0&rev=3
This commit is contained in:
Ana Guerrero
2024-03-26 18:26:20 +00:00
committed by Git OBS Bridge
parent c5b2783354 64b0d8beb3
commit ea2ab5fb95
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
merge3-0.0.12.tar.gz
View File

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

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

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

11
python-merge3.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 25 20:07:15 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 0.0.14:
* migrate to pyproject.toml
* use disperse action
* ruff, pyupgrade
* add merge3 helper
* sort imports with isort
* add python 3.11 support
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 3 09:50:36 UTC 2024 - Dirk Müller <dmueller@suse.com> Wed Jan 3 09:50:36 UTC 2024 - Dirk Müller <dmueller@suse.com>

17
python-merge3.spec
View File

@@ -18,18 +18,21 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-merge3 Name: python-merge3
Version: 0.0.12 Version: 0.0.14
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://www.breezy-vcs.org/ URL: https://github.com/breezy-team/merge3
Source: https://files.pythonhosted.org/packages/source/m/merge3/merge3-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/m/merge3/merge3-%{version}.tar.gz
BuildRequires: %{python_module pip} BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel} BuildRequires: %{python_module wheel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildArch: noarch BuildArch: noarch
Requires(post): update-alternatives
Requires(postun): update-alternatives
%python_subpackages %python_subpackages
%description %description
@@ -43,14 +46,22 @@ Python implementation of 3-way merge
%install %install
%pyproject_install %pyproject_install
%python_clone -a %{buildroot}%{_bindir}/merge3
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
%check %check
%pyunittest -v merge3.test_merge3 %pytest_arch
%post
%python_install_alternative merge3
%postun
%python_uninstall_alternative merge3
%files %{python_files} %files %{python_files}
%doc AUTHORS README.rst %doc AUTHORS README.rst
%license COPYING %license COPYING
%python_alternative %{_bindir}/merge3
%{python_sitelib}/merge3 %{python_sitelib}/merge3
%{python_sitelib}/merge3-%{version}*-info %{python_sitelib}/merge3-%{version}*-info