From f5f36affb47eb39e541b65bae71e4c35da0ee2fcbd83d76eb5cd3720e88c8933 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Mon, 26 Feb 2024 05:59:11 +0000
Subject: [PATCH] - Update to 2.0.0:   * Changed:     + Broken parsing caused
 by `pyparsing` updates fixed.     + Reorganized package/module structure.    
 + Reorganized exception hierarchy.   * Deprecated:     + Test suite option
 `--no-check`.   * Removed:     + Drop support for Python 2 and Python < 3.7.
 - Drop patch pydot-skip-test.patch, no longer required. - Switch to autosetup
 and pyproject macros.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydot?expand=0&rev=29
---
 pydot-1.4.2.tar.gz    |  3 ---
 pydot-2.0.0.tar.gz    |  3 +++
 pydot-skip-test.patch | 12 ------------
 python-pydot.changes  | 15 +++++++++++++++
 python-pydot.spec     | 27 +++++++++++----------------
 5 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 pydot-1.4.2.tar.gz
 create mode 100644 pydot-2.0.0.tar.gz
 delete mode 100644 pydot-skip-test.patch

diff --git a/pydot-1.4.2.tar.gz b/pydot-1.4.2.tar.gz
deleted file mode 100644
index f973032..0000000
--- a/pydot-1.4.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d
-size 137681
diff --git a/pydot-2.0.0.tar.gz b/pydot-2.0.0.tar.gz
new file mode 100644
index 0000000..2ed66c1
--- /dev/null
+++ b/pydot-2.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60246af215123fa062f21cd791be67dda23a6f280df09f68919e637a1e4f3235
+size 152022
diff --git a/pydot-skip-test.patch b/pydot-skip-test.patch
deleted file mode 100644
index a8cfa24..0000000
--- a/pydot-skip-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: pydot-1.4.1/test/pydot_unittest.py
-===================================================================
---- pydot-1.4.1.orig/test/pydot_unittest.py
-+++ pydot-1.4.1/test/pydot_unittest.py
-@@ -205,6 +205,7 @@ class TestGraphAPI(unittest.TestCase):
-         self._render_and_compare_dot_files(path)
- 
- 
-+    @unittest.skip("fails even in git on travis")
-     def test_graphviz_regression_tests(self):
-         path = os.path.join(test_dir, TESTS_DIR_2)
-         self._render_and_compare_dot_files(path)
diff --git a/python-pydot.changes b/python-pydot.changes
index 94701c9..75b15d7 100644
--- a/python-pydot.changes
+++ b/python-pydot.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Feb 26 05:57:42 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 2.0.0:
+  * Changed:
+    + Broken parsing caused by `pyparsing` updates fixed.
+    + Reorganized package/module structure.
+    + Reorganized exception hierarchy.
+  * Deprecated:
+    + Test suite option `--no-check`.
+  * Removed:
+    + Drop support for Python 2 and Python < 3.7.
+- Drop patch pydot-skip-test.patch, no longer required.
+- Switch to autosetup and pyproject macros.
+
 -------------------------------------------------------------------
 Tue Jun 13 11:09:47 UTC 2023 - ecsos <ecsos@opensuse.org>
 
diff --git a/python-pydot.spec b/python-pydot.spec
index 480e387..44293e0 100644
--- a/python-pydot.spec
+++ b/python-pydot.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pydot
 #
-# Copyright (c) 2021 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
@@ -18,17 +18,18 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-pydot
-Version:        1.4.2
+Version:        2.0.0
 Release:        0
 Summary:        Module to create (dot) graphs from Python
 License:        MIT
 URL:            https://github.com/erocarrera/pydot
 Source:         https://files.pythonhosted.org/packages/source/p/pydot/pydot-%{version}.tar.gz
-# https://github.com/pydot/pydot/issues/204
-Patch0:         pydot-skip-test.patch
+BuildRequires:  %{python_module base >= 3.8}
 BuildRequires:  %{python_module chardet}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyparsing >= 2.1.4}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  ghostscript-fonts-std
 BuildRequires:  graphviz
@@ -48,28 +49,22 @@ Python. All attributes implemented in the Dot language up to Graphviz
 2.16 are supported.
 
 %prep
-%setup -q -n pydot-%{version}
-%patch0 -p1
+%autosetup -p1 -n pydot-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# these fail with graphviz 2.49 or later (2021/11)
-rm -v test/my_tests/{html_labels,parsing_test}.dot
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python test/pydot_unittest.py --no-check
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python test/pydot_unittest.py
 
 %files %{python_files}
 %license LICENSE
 %doc README.md
-%{python_sitelib}/dot_parser.py*
-%{python_sitelib}/pydot.py*
-%pycache_only %{python_sitelib}/__pycache__/dot_parser.*.py*
-%pycache_only %{python_sitelib}/__pycache__/pydot.*.py*
-%{python_sitelib}/pydot-%{version}-py*.egg-info
+%{python_sitelib}/pydot
+%{python_sitelib}/pydot-%{version}.dist-info
 
 %changelog