public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-merge3] rawhide: Update to 1.0.0 upstream release
@ 2026-10-25 20:46 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-10-25 20:46 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/python-merge3
Branch : rawhide
Commit : aad5d79e26dcc66e7776bbe40fed9998c52f7387
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-10-25T20:25:04+00:00
Stats : +3/-29 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/python-merge3/c/aad5d79e26dcc66e7776bbe40fed9998c52f7387?branch=rawhide
Log:
Update to 1.0.0 upstream release
- Resolves: rhbz#2560476
Upstream tag: v1.0.0
Upstream commit: 0dcf0ad1
Commit co-authored by Packit automation (https://packit.dev/)
---
diff --git a/130.patch b/130.patch
deleted file mode 100644
index a19a0d8..0000000
--- a/130.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From ee319f195c622546bd283f5d6ae095fdff181436 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 3 Sep 2026 18:16:07 +0100
-Subject: [PATCH] tox: allow passing positional arguments through to unittest
-
-example: `tox -- --verbose`
----
- tox.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tox.ini b/tox.ini
-index 3609068..3a2db1d 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -2,4 +2,4 @@
- downloadcache = {toxworkdir}/cache/
-
- [testenv]
--commands = python3 -m unittest test_merge3
-+commands = python3 -m unittest test_merge3 {posargs}
diff --git a/README.packit b/README.packit
index 2511bf4..55f1550 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 1.12.0.
+The file was generated using packit 1.17.0.
diff --git a/python-merge3.rpmlintrc b/python-merge3.rpmlintrc
deleted file mode 100644
index bcc4601..0000000
--- a/python-merge3.rpmlintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/breezy-team/merge3/pull/129
-addFilter(r" incorrect-fsf-address ")
diff --git a/python-merge3.spec b/python-merge3.spec
index 2fe4c53..83374f9 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -1,5 +1,5 @@
Name: python-merge3
-Version: 0.0.16
+Version: 1.0.0
Release: %autorelease
Summary: Python implementation of 3-way merge
@@ -10,10 +10,6 @@ Source0: %{url}/archive/v%{version}/merge3-%{version}.tar.gz
# and on README.rst.
Source1: merge3.1
-# tox: allow passing positional arguments through to unittest
-# https://github.com/breezy-team/merge3/pull/130
-Patch: %{url}/pull/130.patch
-
BuildSystem: pyproject
BuildOption(generate_buildrequires): --tox
BuildOption(install): --assert-license merge3
diff --git a/sources b/sources
index 6710db5..88091b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (merge3-0.0.16.tar.gz) = bcbf42145a79845c2a53d788949def6f254ae4d951e203f73555da09ed73a669c37ba29cef3f1bf3dcb60a6530b04953852447b8b0dfadc22cf8f6ba60c22ce0
+SHA512 (merge3-1.0.0.tar.gz) = ec53177eac667362d283ae0e28cc0b5607f84bd744e834335c1299a773bbcfcf7e2352d488d4111543b17b8a04c06e879232eaa0c3fce14694f74e4761f8726b
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-10-25 20:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-25 20:46 [rpms/python-merge3] rawhide: Update to 1.0.0 upstream release Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox