Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-merge3 for openSUSE:Factory checked in at 2026-10-26 10:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-merge3 (Old) and /work/SRC/openSUSE:Factory/.python-merge3.new.2252680 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-merge3" Mon Oct 26 10:00:54 2026 rev:6 rq:1392457 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-merge3/python-merge3.changes 2025-11-17 12:20:44.615103415 +0100 +++ /work/SRC/openSUSE:Factory/.python-merge3.new.2252680/python-merge3.changes 2026-10-26 10:02:14.795361187 +0100 @@ -1,0 +2,6 @@ +Sun Oct 25 15:22:53 UTC 2026 - Dirk Müller <[email protected]> + +- update to 1.0.0: + * Python 3.15 support + +------------------------------------------------------------------- Old: ---- merge3-0.0.16.tar.gz New: ---- merge3-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-merge3.spec ++++++ --- /var/tmp/diff_new_pack.kJc7cO/_old 2026-10-26 10:02:15.695398931 +0100 +++ /var/tmp/diff_new_pack.kJc7cO/_new 2026-10-26 10:02:15.698399057 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-merge3 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-merge3 -Version: 0.0.16 +Version: 1.0.0 Release: 0 Summary: Python implementation of 3-way merge License: GPL-2.0-or-later ++++++ merge3-0.0.16.tar.gz -> merge3-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/.github/workflows/disperse.yml new/merge3-1.0.0/.github/workflows/disperse.yml --- old/merge3-0.0.16/.github/workflows/disperse.yml 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/.github/workflows/disperse.yml 2026-10-11 17:28:40.000000000 +0200 @@ -10,5 +10,5 @@ runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: jelmer/action-disperse-validate@v2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/.github/workflows/pythonpackage.yml new/merge3-1.0.0/.github/workflows/pythonpackage.yml --- old/merge3-0.0.16/.github/workflows/pythonpackage.yml 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/.github/workflows/pythonpackage.yml 2026-10-11 17:28:40.000000000 +0200 @@ -9,11 +9,11 @@ strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.9'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15', '3.9'] fail-fast: false steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v6 with: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/.github/workflows/wheels.yaml new/merge3-1.0.0/.github/workflows/wheels.yaml --- old/merge3-0.0.16/.github/workflows/wheels.yaml 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/.github/workflows/wheels.yaml 2026-10-11 17:28:40.000000000 +0200 @@ -15,7 +15,7 @@ fail-fast: true steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 - name: Install dependencies run: | @@ -24,7 +24,7 @@ - name: Build wheels run: python -m build --wheel - name: Upload wheels - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: artifact-${{ matrix.os }} path: ./dist/*.whl @@ -32,7 +32,7 @@ build-sdist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 - name: Install dependencies run: | @@ -41,7 +41,7 @@ - name: Build sdist run: python -m build --sdist - name: Upload sdist - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: artifact-source path: ./dist/*.tar.gz @@ -59,7 +59,7 @@ # See https://github.com/pypa/twine/issues/1216 pip install "twine>=6.1.0" "packaging>=24.2" - name: Download sdist - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: name: artifact-source path: dist @@ -81,7 +81,7 @@ url: https://pypi.org/p/merge3 steps: - name: Download distributions - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v7 with: merge-multiple: true pattern: artifact-* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/COPYING new/merge3-1.0.0/COPYING --- old/merge3-0.0.16/COPYING 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/COPYING 2026-10-11 17:28:40.000000000 +0200 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -304,8 +304,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + with this program; if not, see <https://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. @@ -329,8 +328,8 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice + <signature of Moe Ghoul>, 1 April 1989 + Moe Ghoul, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/merge3/__init__.py new/merge3-1.0.0/merge3/__init__.py --- old/merge3-0.0.16/merge3/__init__.py 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/merge3/__init__.py 2026-10-11 17:28:40.000000000 +0200 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program; if not, see <https://www.gnu.org/licenses/>. # mbp: "you know that thing where cvs gives you conflict markers?" @@ -34,7 +33,7 @@ cast, ) -__version__ = (0, 0, 16) +__version__ = (1, 0, 0) # Type variables for more flexible typing S = TypeVar("S") # For sequence elements in compare_range diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/merge3/__main__.py new/merge3-1.0.0/merge3/__main__.py --- old/merge3-0.0.16/merge3/__main__.py 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/merge3/__main__.py 2026-10-11 17:28:40.000000000 +0200 @@ -11,8 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program; if not, see <https://www.gnu.org/licenses/>. import sys from typing import List, Optional diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/pyproject.toml new/merge3-1.0.0/pyproject.toml --- old/merge3-0.0.16/pyproject.toml 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/pyproject.toml 2026-10-11 17:28:40.000000000 +0200 @@ -15,6 +15,7 @@ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3.15", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Operating System :: POSIX", @@ -33,7 +34,7 @@ [project.optional-dependencies] "dev" = [ - "ruff==0.14.0", + "ruff==0.14.10", "mypy>=1.0.0" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/test_merge3.py new/merge3-1.0.0/test_merge3.py --- old/merge3-0.0.16/test_merge3.py 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/test_merge3.py 2026-10-11 17:28:40.000000000 +0200 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program; if not, see <https://www.gnu.org/licenses/>. import struct import unittest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/merge3-0.0.16/tox.ini new/merge3-1.0.0/tox.ini --- old/merge3-0.0.16/tox.ini 2025-10-15 18:21:04.000000000 +0200 +++ new/merge3-1.0.0/tox.ini 2026-10-11 17:28:40.000000000 +0200 @@ -2,4 +2,4 @@ downloadcache = {toxworkdir}/cache/ [testenv] -commands = python3 -m unittest test_merge3 +commands = python3 -m unittest test_merge3 {posargs}
