diff --git a/.files b/.files index 3737905..0e0e24f 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 5de44ca..f26396d 100644 --- a/.rev +++ b/.rev @@ -15,4 +15,18 @@ - require setuptools 1136434 + + 7dc972ed0f71602ae39f364b009aafeb + 0.0.14 + + anag+factory + - 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 + 1161548 + diff --git a/merge3-0.0.12.tar.gz b/merge3-0.0.12.tar.gz deleted file mode 120000 index 4ffe669..0000000 --- a/merge3-0.0.12.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreih5h7ehhxhwbomuiydncjpxezbqkxdtt72bpe4xttf55i7knamngy \ No newline at end of file diff --git a/merge3-0.0.14.tar.gz b/merge3-0.0.14.tar.gz new file mode 120000 index 0000000..2f7b8d2 --- /dev/null +++ b/merge3-0.0.14.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreibqibxjsodpjjssqd5zyq7gqgeq7ivb3a44vqtvtukwy7gbmayble \ No newline at end of file diff --git a/python-merge3.changes b/python-merge3.changes index c5f81d7..03650aa 100644 --- a/python-merge3.changes +++ b/python-merge3.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Mon Mar 25 20:07:15 UTC 2024 - Dirk Müller + +- 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 - require setuptools diff --git a/python-merge3.spec b/python-merge3.spec index a7fdde7..3249dce 100644 --- a/python-merge3.spec +++ b/python-merge3.spec @@ -18,18 +18,21 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-merge3 -Version: 0.0.12 +Version: 0.0.14 Release: 0 Summary: Python implementation of 3-way merge 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 BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch +Requires(post): update-alternatives +Requires(postun): update-alternatives %python_subpackages %description @@ -43,14 +46,22 @@ Python implementation of 3-way merge %install %pyproject_install +%python_clone -a %{buildroot}%{_bindir}/merge3 %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pyunittest -v merge3.test_merge3 +%pytest_arch + +%post +%python_install_alternative merge3 + +%postun +%python_uninstall_alternative merge3 %files %{python_files} %doc AUTHORS README.rst %license COPYING +%python_alternative %{_bindir}/merge3 %{python_sitelib}/merge3 %{python_sitelib}/merge3-%{version}*-info