diff --git a/python-PyYAML.changes b/python-PyYAML.changes index f4857a9..82e5707 100644 --- a/python-PyYAML.changes +++ b/python-PyYAML.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 26 03:18:33 UTC 2024 - Steve Kowalik + +- 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 diff --git a/python-PyYAML.spec b/python-PyYAML.spec index 658c0cc..8071788 100644 --- a/python-PyYAML.spec +++ b/python-PyYAML.spec @@ -1,7 +1,7 @@ # # spec file for package python-PyYAML # -# Copyright (c) 2023 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 @@ -24,9 +24,10 @@ 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 -Patch0: setuptools.patch BuildRequires: %{python_module Cython with %python-Cython < 3} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: libyaml-devel BuildRequires: python-rpm-macros @@ -46,17 +47,16 @@ PyYAML is applicable for a broad range of tasks from complex configuration files to object serialization and persistance. %prep -%setup -q -n PyYAML-%{version} -%patch0 -p1 +%autosetup -p1 -n PyYAML-%{version} %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel # Fix example permissions. find examples/ -type f | xargs chmod a-x %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check @@ -71,6 +71,6 @@ ulimit -Sn 2048 %doc CHANGES README.md examples/ %{python_sitearch}/yaml %{python_sitearch}/_yaml -%{python_sitearch}/PyYAML-%{version}*-info +%{python_sitearch}/PyYAML-%{version}.dist-info %changelog diff --git a/setuptools.patch b/setuptools.patch deleted file mode 100644 index 47ec714..0000000 --- a/setuptools.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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