- Update to 2.6.3:

* Solved an error in the xmlformatter when using default namespaces. #89
  * #108: Fixed an error that happens if using namespaces like ns0 or ns1.
  * Added `InsertNamespace` and `DeleteNamespace` actions for better handling
    of changing namespaces. Should improve any "Unknown namespace prefix"
    errors. Changing the URI of a a namespace prefix is not supported, and
    will raise an error.
  * Used geometric mean for the node_ratio, for better handling of simple nodes.
  * Added an experimental --best-match method that is slower, but generate
    smaller diffs when you have many nodes that are similar.
  * The -F argument now also affects the --fast-match stage.
  * Make it possible to adjust the attributes considered when comparing nodes.
  * Python versions 3.7 to 3.11 are now supported.
  * Improved node matching method, that puts more emphasis similarities than
    differences when weighing attributes vs children.
  * Added a parameter to return error code 1 when there are differences
    between the files
  * Added a parameter for ignoring attributes in comparison.
  * Solved a bug in xmlpatch in certain namespace situations.
  * Added a --diff-encoding parameter to xmlpatch, to support diff-files
    that are not in your system default encoding.
- Switch to autosetup and pyproject macros.
- No more greedy globs in %files.
- Drop python-xmldiff-src-upgrades.patch, now included upstream.
- Drop python-xmldiff-no-six-remains.patch, no longer required.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmldiff?expand=0&rev=19

python-xmldiff-no-six-remains.patch

@@ -1,43 +0,0 @@
-Index: xmldiff-2.4/tests/test_main.py
-===================================================================
---- xmldiff-2.4.orig/tests/test_main.py
-+++ xmldiff-2.4/tests/test_main.py
-@@ -1,5 +1,5 @@
-+import io
- import os
--import six
- import sys
- import unittest
- 
-@@ -71,8 +71,8 @@ class MainAPITests(unittest.TestCase):
- 
- class MainCLITests(unittest.TestCase):
-     def call_run(self, args, command=main.diff_command):
--        output = six.StringIO()
--        errors = six.StringIO()
-+        output = io.StringIO()
-+        errors = io.StringIO()
- 
-         stdout = sys.stdout
-         stderr = sys.stderr
-Index: xmldiff-2.4/xmldiff.egg-info/requires.txt
-===================================================================
---- xmldiff-2.4.orig/xmldiff.egg-info/requires.txt
-+++ xmldiff-2.4/xmldiff.egg-info/requires.txt
-@@ -1,3 +1,2 @@
- setuptools
- lxml>=3.1.0
--six
-Index: xmldiff-2.4/setup.py
-===================================================================
---- xmldiff-2.4.orig/setup.py
-+++ xmldiff-2.4/setup.py
-@@ -33,7 +33,7 @@ setup(
-     packages=find_packages(exclude=["doc", "tests"]),
-     include_package_data=True,
-     zip_safe=False,
--    install_requires=["setuptools", "lxml>=3.1.0", "six",],
-+    install_requires=["setuptools", "lxml>=3.1.0",],
-     test_suite="tests",
-     entry_points={
-         "console_scripts": [

python-xmldiff.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Mar  5 04:33:13 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 2.6.3:
+  * Solved an error in the xmlformatter when using default namespaces. #89
+  * #108: Fixed an error that happens if using namespaces like ns0 or ns1.
+  * Added `InsertNamespace` and `DeleteNamespace` actions for better handling
+    of changing namespaces. Should improve any "Unknown namespace prefix"
+    errors. Changing the URI of a a namespace prefix is not supported, and
+    will raise an error.
+  * Used geometric mean for the node_ratio, for better handling of simple nodes.
+  * Added an experimental --best-match method that is slower, but generate
+    smaller diffs when you have many nodes that are similar.
+  * The -F argument now also affects the --fast-match stage.
+  * Make it possible to adjust the attributes considered when comparing nodes.
+  * Python versions 3.7 to 3.11 are now supported.
+  * Improved node matching method, that puts more emphasis similarities than
+    differences when weighing attributes vs children.
+  * Added a parameter to return error code 1 when there are differences
+    between the files
+  * Added a parameter for ignoring attributes in comparison.
+  * Solved a bug in xmlpatch in certain namespace situations.
+  * Added a --diff-encoding parameter to xmlpatch, to support diff-files
+    that are not in your system default encoding.
+- Switch to autosetup and pyproject macros.
+- No more greedy globs in %files.
+- Drop python-xmldiff-src-upgrades.patch, now included upstream.
+- Drop python-xmldiff-no-six-remains.patch, no longer required.
+
 -------------------------------------------------------------------
 Fri Oct 14 12:10:39 UTC 2022 - pgajdos@suse.com
 

python-xmldiff.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-xmldiff
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,16 @@
 
 
 %define oldpython python
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-xmldiff
-Version:        2.4
+Version:        2.6.3
 Release:        0
 Summary:        Tree to tree correction between XML documents
 License:        MIT
 URL:            https://github.com/Shoobx/xmldiff
 Source:         https://files.pythonhosted.org/packages/source/x/xmldiff/xmldiff-%{version}.tar.gz
-# https://github.com/Shoobx/xmldiff/commit/34b810f4394965aadeca31204e6b76eb023fd11a
+BuildRequires:  %{python_module pip}
-Patch0:         python-xmldiff-src-upgrades.patch
-# https://github.com/Shoobx/xmldiff/issues/93
-Patch1:         python-xmldiff-no-six-remains.patch
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-lxml >= 3.1.0
@@ -40,7 +37,6 @@ Conflicts:      %{oldpython}-xmldiff < %{version}
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module lxml >= 3.1.0}
-BuildRequires:  %{python_module setuptools}
 # /SECTION
 %python_subpackages
 
@@ -53,15 +49,13 @@ structured information", by S. Chawathe, A. Rajaraman, H.
 Garcia-Molina, and J. Widom, Stanford University, 1996.
 
 %prep
-%setup -q -n xmldiff-%{version}
+%autosetup -p1 -n xmldiff-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/xmlpatch
 %python_clone -a %{buildroot}%{_bindir}/xmldiff
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
@@ -82,6 +76,7 @@ Garcia-Molina, and J. Widom, Stanford University, 1996.
 %license LICENSE.txt
 %python_alternative %{_bindir}/xmldiff
 %python_alternative %{_bindir}/xmlpatch
-%{python_sitelib}/*
+%{python_sitelib}/xmldiff
+%{python_sitelib}/xmldiff-%{version}.dist-info
 
 %changelog

xmldiff-2.4.tar.gz

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

xmldiff-2.6.3.tar.gz

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