diff --git a/10.patch b/10.patch deleted file mode 100644 index 35a36fd..0000000 --- a/10.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Miro Hrončok -# Date 1733147018 -3600 -# Mon Dec 02 14:43:38 2024 +0100 -# Node ID 0c7d924a643f990dd365db57ac3d52baf7db34fb -# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 -Do not specificity build-system.requires on wheel - -When building from pyproject.toml, setuptools only needed wheel for building wheels. -It was never needed needed to build sdists. -Setuptools knww this and properly generated the dependency on wheel only when needed. - -With the current setuptools version, wheel is not needed at all. - -See also https://github.com/pypa/pip/pull/12728 - -diff -r 0bef9fa8b3c4 -r 0c7d924a643f setup.py ---- a/setup.py Thu Mar 14 10:13:16 2024 +0100 -+++ b/setup.py Mon Dec 02 14:43:38 2024 +0100 -@@ -830,7 +830,7 @@ - with open(file_name, 'w') as fp: - fp.write(dedent("""\ - [build-system] -- requires = ["setuptools", "wheel"] -+ requires = ["setuptools"] - # test - build-backend = "setuptools.build_meta" - """)) diff --git a/9.patch b/9.patch deleted file mode 100644 index 34e5743..0000000 --- a/9.patch +++ /dev/null @@ -1,63 +0,0 @@ -# HG changeset patch -# User Miro Hrončok -# Date 1733146158 -3600 -# Mon Dec 02 14:29:18 2024 +0100 -# Branch python3.14 -# Node ID 677f1d63658f35e43446776e637248d0729405f3 -# Parent 0bef9fa8b3c43637cd90ce3f2e299e81c2122128 -Adjust setup.py for the removal of deprecated ast classes - -Those were deprecated since Python 3.8 and are removed in 3.14+. - -diff -r 0bef9fa8b3c4 -r 677f1d63658f setup.py ---- a/setup.py Thu Mar 14 10:13:16 2024 +0100 -+++ b/setup.py Mon Dec 02 14:29:18 2024 +0100 -@@ -76,7 +76,7 @@ - print(*args, **kw1) - - if sys.version_info >= (3, 8): -- from ast import Str, Num, Bytes, NameConstant # NOQA -+ from ast import Constant # NOQA - - - def literal_eval(node_or_string): -@@ -98,15 +98,21 @@ - raise TypeError('only string or AST nodes supported') - - def _convert(node): -- if isinstance(node, Str): -- if sys.version_info < (3,) and not isinstance(node.s, unicode): -- return node.s.decode('utf-8') -- return node.s -- elif isinstance(node, Bytes): -- return node.s -- elif isinstance(node, Num): -- return node.n -- elif isinstance(node, Tuple): -+ if sys.version_info >= (3, 8): -+ if isinstance(node, Constant): -+ return node.value -+ else: -+ if isinstance(node, Str): -+ if sys.version_info < (3,) and not isinstance(node.s, unicode): -+ return node.s.decode('utf-8') -+ return node.s -+ elif isinstance(node, Bytes): -+ return node.s -+ elif isinstance(node, Num): -+ return node.n -+ elif isinstance(node, NameConstant): -+ return node.value -+ if isinstance(node, Tuple): - return tuple(map(_convert, node.elts)) - elif isinstance(node, List): - return list(map(_convert, node.elts)) -@@ -114,8 +120,6 @@ - return set(map(_convert, node.elts)) - elif isinstance(node, Dict): - return {_convert(k): _convert(v) for k, v in zip(node.keys, node.values)} -- elif isinstance(node, NameConstant): -- return node.value - elif sys.version_info < (3, 4) and isinstance(node, Name): - if node.id in _safe_names: - return _safe_names[node.id] diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec index d9f7066..9b8de79 100644 --- a/python-ruamel-yaml.spec +++ b/python-ruamel-yaml.spec @@ -1,10 +1,10 @@ # Breaks the circular dependency with ruamel.yaml.clib. %bcond_with bootstrap -%global commit 6f41eb6001661917fceb0e88ed0693ae1a7c50f4 +%global commit 04ba5ead9be050430fac2ca1d4e88b8e91f7be02 Name: python-ruamel-yaml -Version: 0.18.6 +Version: 0.18.10 Release: %autorelease Summary: YAML 1.2 loader/dumper package for Python @@ -14,16 +14,6 @@ URL: https://sourceforge.net/projects/ruamel-yaml # The PyPI sdist does not contain tests, so we use a snapshot from SourceForge Source: https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml/code/ruamel-yaml-code-%{commit}.zip -# Adjust setup.py for the removal of deprecated ast classes -# Fixes build with Python 3.14 -# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/9/ -Patch: 9.patch - -# Do not specificity build-system.requires on wheel -# Fixes the bootstrap build (see commit message for details) -# https://sourceforge.net/p/ruamel-yaml/code/merge-requests/10/ -Patch: 10.patch - BuildArch: noarch %global _description %{expand: diff --git a/sources b/sources index f52e86d..898c9bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruamel-yaml-code-6f41eb6001661917fceb0e88ed0693ae1a7c50f4.zip) = 49fc9ef87e59b723803659300a8dc2c33d596bc2e1effa5235f26cf51fb08c0e6e0d2c386d54c290f97d63dc2a8956802a02c90e4a52881a2cd5d38daf1b0318 +SHA512 (ruamel-yaml-code-04ba5ead9be050430fac2ca1d4e88b8e91f7be02.zip) = 2e94f334d5750df28922c2efc58527fca696d6b41be91e70d2897647ac93e946d34bc7c2cce3185c7117b7444552feb19f6b952ba5ca598663549f3048486a80