Sync from SUSE:SLFO:1.1 python-PyYAML revision 99f206559635ceac2fac8e965324cbfd

python-PyYAML.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-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>
-
-- add build-with-cython3.patch from 6.0.2rc1 to build with
-  cython3 (needed for python 3.13+)
-
--------------------------------------------------------------------
-Mon Feb 26 03:18:33 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
-
-- Switch to pyproject and autosetup macros.
-- Drop patch setuptools.patch, we can now cope.
-
 -------------------------------------------------------------------
 Tue Sep 19 16:25:38 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-PyYAML.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-PyYAML
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,15 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-PyYAML
-Version:        6.0.2
+Version:        6.0.1
 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
-BuildRequires:  %{python_module Cython}
-BuildRequires:  %{python_module pip}
+Source:         https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-%{version}.tar.gz
+Patch0:         setuptools.patch
+BuildRequires:  %{python_module Cython with %python-Cython < 3}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  libyaml-devel
 BuildRequires:  python-rpm-macros
@@ -47,17 +46,17 @@ PyYAML is applicable for a broad range of tasks from complex
 configuration files to object serialization and persistance.
 
 %prep
-%autosetup -p1 -n pyyaml-%{version}
+%setup -q -n PyYAML-%{version}
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags}"
-export PYYAML_FORCE_CYTHON=1
-%pyproject_wheel
+%python_build
 # Fix example permissions.
 find examples/ -type f | xargs chmod a-x
 
 %install
-%pyproject_install
+%python_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
@@ -65,13 +64,13 @@ 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/legacy_tests/test_all.py}
+%{python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python tests/lib/test_all.py}
 
 %files %{python_files}
 %license LICENSE
 %doc CHANGES README.md examples/
 %{python_sitearch}/yaml
 %{python_sitearch}/_yaml
-%{python_sitearch}/PyYAML-%{version}.dist-info
+%{python_sitearch}/PyYAML-%{version}*-info
 
 %changelog

setuptools.patch

@@ -0,0 +1,11 @@
+--- PyYAML-6.0/setup.py	2021-10-13 21:13:52.000000000 +0200
++++ PyYAML-6.0/setup.py.new	2021-11-03 14:36:40.093725379 +0100
+@@ -67,7 +67,7 @@
+ import sys, os, os.path, pathlib, platform, shutil, tempfile, warnings
+ 
+ # for newer setuptools, enable the embedded distutils before importing setuptools/distutils to avoid warnings
+-os.environ['SETUPTOOLS_USE_DISTUTILS'] = 'local'
++#os.environ['SETUPTOOLS_USE_DISTUTILS'] = 'local'
+ 
+ from setuptools import setup, Command, Distribution as _Distribution, Extension as _Extension
+ from setuptools.command.build_ext import build_ext as _build_ext