From e3472d4719a3507d63e2962dbca0b45733b59c7887baf0216b8564e79ec29789 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 2 Oct 2024 08:38:17 +0000
Subject: [PATCH] Accepting request 1205102 from
 home:glaubitz:branches:devel:languages:python

- Update to 6.0.2
  * Support for Cython 3.x and Python 3.13
- Adjust invocation path for testsuite
- Adjust upstream source name in spec file
- Drop build-with-cython3.patch, merged upstream

OBS-URL: https://build.opensuse.org/request/show/1205102
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyYAML?expand=0&rev=61
---
 PyYAML-6.0.1.tar.gz      |  3 ---
 build-with-cython3.patch | 17 -----------------
 python-PyYAML.changes    |  9 +++++++++
 python-PyYAML.spec       |  9 ++++-----
 pyyaml-6.0.2.tar.gz      |  3 +++
 5 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 PyYAML-6.0.1.tar.gz
 delete mode 100644 build-with-cython3.patch
 create mode 100644 pyyaml-6.0.2.tar.gz

diff --git a/PyYAML-6.0.1.tar.gz b/PyYAML-6.0.1.tar.gz
deleted file mode 100644
index 3135c1e..0000000
--- a/PyYAML-6.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43
-size 125201
diff --git a/build-with-cython3.patch b/build-with-cython3.patch
deleted file mode 100644
index d0ab151..0000000
--- a/build-with-cython3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: PyYAML-6.0.1/setup.py
-===================================================================
---- PyYAML-6.0.1.orig/setup.py
-+++ PyYAML-6.0.1/setup.py
-@@ -82,7 +82,11 @@ if 'sdist' in sys.argv or os.environ.get
-     with_cython = True
- try:
-     from Cython.Distutils.extension import Extension as _Extension
--    from Cython.Distutils import build_ext as _build_ext
-+    try:
-+         # try old_build_ext from Cython > 3 first, until we can dump it entirely
-+         from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
-+    except ImportError:
-+        from Cython.Distutils import build_ext as _build_ext
-     with_cython = True
- except ImportError:
-     if with_cython:
diff --git a/python-PyYAML.changes b/python-PyYAML.changes
index 6151804..310efa4 100644
--- a/python-PyYAML.changes
+++ b/python-PyYAML.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Oct  2 08:15:26 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 6.0.2
+  * Support for Cython 3.x and Python 3.13
+- Adjust invocation path for testsuite
+- Adjust upstream source name in spec file
+- Drop build-with-cython3.patch, merged upstream
+
 -------------------------------------------------------------------
 Mon Jul  1 10:52:46 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-PyYAML.spec b/python-PyYAML.spec
index 7b2f3cf..1eab669 100644
--- a/python-PyYAML.spec
+++ b/python-PyYAML.spec
@@ -18,13 +18,12 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-PyYAML
-Version:        6.0.1
+Version:        6.0.2
 Release:        0
 Summary:        YAML parser and emitter for Python
 License:        MIT
 URL:            https://github.com/yaml/pyyaml
-Source:         https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-%{version}.tar.gz
-Patch1:         build-with-cython3.patch
+Source:         https://files.pythonhosted.org/packages/source/p/pyyaml/pyyaml-%{version}.tar.gz
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
@@ -48,7 +47,7 @@ PyYAML is applicable for a broad range of tasks from complex
 configuration files to object serialization and persistance.
 
 %prep
-%autosetup -p1 -n PyYAML-%{version}
+%autosetup -p1 -n pyyaml-%{version}
 
 %build
 export CFLAGS="%{optflags}"
@@ -66,7 +65,7 @@ find examples/ -type f | xargs chmod a-x
 %ifarch ppc ppc64 s390 s390x
 ulimit -Sn 2048
 %endif
-%{python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python tests/lib/test_all.py}
+%{python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python tests/legacy_tests/test_all.py}
 
 %files %{python_files}
 %license LICENSE
diff --git a/pyyaml-6.0.2.tar.gz b/pyyaml-6.0.2.tar.gz
new file mode 100644
index 0000000..4f2113c
--- /dev/null
+++ b/pyyaml-6.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e
+size 130631