diff options
Diffstat (limited to 'dev-python/astor')
| -rw-r--r-- | dev-python/astor/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/astor/astor-0.8.1-r1.ebuild | 32 | ||||
| -rw-r--r-- | dev-python/astor/astor-0.8.1-r2.ebuild | 36 | ||||
| -rw-r--r-- | dev-python/astor/files/astor-0.8.1-py314.patch | 99 |
4 files changed, 166 insertions, 5 deletions
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest index 9f4ebd1fd684..5f813e7166de 100644 --- a/dev-python/astor/Manifest +++ b/dev-python/astor/Manifest @@ -1,4 +1,6 @@ +AUX astor-0.8.1-py314.patch 4199 BLAKE2B 9e5b039e1b2031b024fec2344dbc635006440027a43c964bf707cefe2a7ce4312556433debd351a8045d657953a02023a7ca63a8ccfdfabe54ddaa106c449614 SHA512 f833c3064094c6255a00442667f07d5f0c519abbc62a6c4bf622857047f1cb93cbd2211d77b3b15ba8d22b5d59b4d4aae6e3dd63afc4156b95124bf5888faa0d AUX astor-0.8.1-tests-bigint.patch 1251 BLAKE2B 0d6e9d6451cc52f794edbdda06dfe0b4590fa8f407d00e28a3d60d5056f00b59ea13dbe1faabd4d0a4dddc1e51d58a916a3921cc3a799e28716a31cd5b0dc62d SHA512 220b76f81448d84bbcc1d87f24fcca33793fb63f98669ab90fb952f8795ebc3fb120ac40b894b8b3734b21de895c25412c60252436bbc6c1a19a69afee20e3ce DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28 -EBUILD astor-0.8.1-r1.ebuild 587 BLAKE2B 0ecd7dde72f3a4d17a1a4652cac6cacbdbf3875bd458e2dc4c84f0cebf1ad96736d3c70d67e876e04f87ce606d534fe230ac9729b5c6da2613b436e6d9aee06e SHA512 298a9af0344d8c05cb9ab162469b7fe22e52b898d83383d3dd78531627b9e1957ecc316c054a75e4dc1f2072944c7abf4ae804e05c0173a968315dae2c6804e1 +EBUILD astor-0.8.1-r1.ebuild 1426 BLAKE2B b195358234e212ee7a1aa23a80e135523ea2e470d2857a4e01c375142dbeb519ea844d2bcb5857f02bbd01543909cb8cf19f37c390999f22e9997c3401c43710 SHA512 a89bb060c1ec6fa3568491a1bf4e3346acda83cbb8cbcab5326050952a7ec30f236ea94e9876584848c0405de5f9b0897193fb736c96834784288ed6e93891d7 +EBUILD astor-0.8.1-r2.ebuild 751 BLAKE2B 1ce23082f267a3f07737ffc84a560602e24f05ff9c14c15286aee29dc15b37f188210e338826dde7700012b4a54e30e02b24016621379313dff2efedc6a8b59a SHA512 51722a16a8393d72592c39976f0cf543b2ce5546a82e3050be42ea1e9bee13b6025b2ecab10fb55108155ba46abc1c7d79ac1c19ad7113511c9e7b7fd96b6a7d MISC metadata.xml 391 BLAKE2B 484d2cd9e52afbc57c49df869d111c214de2a3f1914700a168554f5946b89522d48a613c37a3f2fa704fc8de585047304340148ec34c7a7d8e8097d7499eb507 SHA512 413a0cd6331515c0462f22bcdf7fa1c2693e282b84bc34efcb9ada65f5ca65c6808bd9d678b6c9d1e24c5230dc1c5f3417cda38ee79103a372997a30d68dc572 diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild index 8d108a02b027..7f7c08576247 100644 --- a/dev-python/astor/astor-0.8.1-r1.ebuild +++ b/dev-python/astor/astor-0.8.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) +PYTHON_COMPAT=( pypy3_11 python3_{11..14} ) inherit distutils-r1 pypi @@ -24,6 +24,30 @@ PATCHES=( distutils_enable_tests pytest -EPYTEST_IGNORE=( - tests/test_rtrip.py -) +python_test() { + local EPYTEST_IGNORE=( + tests/test_rtrip.py + ) + local EPYTEST_DESELECT=() + + case ${EPYTHON} in + python3.14) + EPYTEST_DESELECT+=( + # TODO + tests/test_code_gen.py::CodegenTestCase::test_complex + tests/test_code_gen.py::CodegenTestCase::test_deprecated_constant_nodes + tests/test_code_gen.py::CodegenTestCase::test_deprecated_name_constants + tests/test_code_gen.py::CodegenTestCase::test_fstring_debugging + tests/test_code_gen.py::CodegenTestCase::test_fstring_escaped_braces + tests/test_code_gen.py::CodegenTestCase::test_fstring_trailing_newline + tests/test_code_gen.py::CodegenTestCase::test_fstrings + tests/test_code_gen.py::CodegenTestCase::test_huge_int + tests/test_code_gen.py::CodegenTestCase::test_inf + tests/test_code_gen.py::CodegenTestCase::test_nan + ) + ;; + esac + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} diff --git a/dev-python/astor/astor-0.8.1-r2.ebuild b/dev-python/astor/astor-0.8.1-r2.ebuild new file mode 100644 index 000000000000..08f728111eb2 --- /dev/null +++ b/dev-python/astor/astor-0.8.1-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3_11 python3_{11..14} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Read/rewrite/write Python ASTs" +HOMEPAGE=" + https://pypi.org/project/astor/ + https://github.com/berkerpeksag/astor/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +PATCHES=( + "${FILESDIR}/${P}-tests-bigint.patch" + # https://github.com/berkerpeksag/astor/pull/233 + "${FILESDIR}/${P}-py314.patch" +) + +distutils_enable_tests pytest + +python_test() { + local EPYTEST_IGNORE=( + tests/test_rtrip.py + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} diff --git a/dev-python/astor/files/astor-0.8.1-py314.patch b/dev-python/astor/files/astor-0.8.1-py314.patch new file mode 100644 index 000000000000..e5af45648393 --- /dev/null +++ b/dev-python/astor/files/astor-0.8.1-py314.patch @@ -0,0 +1,99 @@ +From d0b5563cc1e263f08df9312d89a7691167448f4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 14 May 2025 19:52:30 +0200 +Subject: [PATCH] Fix compatibility with Python 3.14 (mostly) + +Fix the code and the test suite to work with Python 3.14, where +deprecated constant-like AST nodes were removed. Notably: + +1. Skip tests for deprecated nodes in Python 3.14. + +2. Use `ast.Constant` over `ast.Num` for non-deprecated code + in Python 3.6+. + +3. Check for `ast.Str` only in Python < 3.14, and handle `ast.Constant` + being used to represent a string instead. + +With these changes, all tests except for: + + tests/test_rtrip.py::RtripTestCase::test_convert_stdlib + +pass. However, this particular test also hanged for me with older Python +versions. + +Related to #217 +--- + astor/code_gen.py | 9 +++++++-- + tests/test_code_gen.py | 11 ++++++++--- + 2 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/astor/code_gen.py b/astor/code_gen.py +index b2bae12..4330f49 100644 +--- a/astor/code_gen.py ++++ b/astor/code_gen.py +@@ -692,6 +692,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + current_line = ''.join(current_line) + + has_ast_constant = sys.version_info >= (3, 6) ++ has_ast_str = sys.version_info < (3, 14) + + if is_joined: + # Handle new f-strings. This is a bit complicated, because +@@ -700,7 +701,7 @@ def _handle_string_constant(self, node, value, is_joined=False): + + def recurse(node): + for value in node.values: +- if isinstance(value, ast.Str): ++ if has_ast_str and isinstance(value, ast.Str): + # Double up braces to escape them. + self.write(value.s.replace('{', '{{').replace('}', '}}')) + elif isinstance(value, ast.FormattedValue): +@@ -713,7 +714,11 @@ def recurse(node): + self.write(':') + recurse(value.format_spec) + elif has_ast_constant and isinstance(value, ast.Constant): +- self.write(value.value) ++ if isinstance(value.value, str): ++ # Double up braces to escape them. ++ self.write(value.value.replace('{', '{{').replace('}', '}}')) ++ else: ++ self.write(value.value) + else: + kind = type(value).__name__ + assert False, 'Invalid node %s inside JoinedStr' % kind +diff --git a/tests/test_code_gen.py b/tests/test_code_gen.py +index e828eb9..1825030 100644 +--- a/tests/test_code_gen.py ++++ b/tests/test_code_gen.py +@@ -28,7 +28,10 @@ def astorexpr(x): + return eval(astor.to_source(ast.Expression(body=x))) + + def astornum(x): +- return astorexpr(ast.Num(n=x)) ++ if sys.version_info >= (3, 6): ++ return astorexpr(ast.Constant(x)) ++ else: ++ return astorexpr(ast.Num(n=x)) + + class Comparisons(object): + +@@ -515,8 +518,8 @@ def test_deprecated_constants_as_name(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Name(id='None')), + "spam = None") + +- @unittest.skipUnless(sys.version_info >= (3, 4), +- "ast.NameConstant introduced in Python 3.4") ++ @unittest.skipUnless((3, 4) <= sys.version_info < (3, 14), ++ "ast.NameConstant introduced in Python 3.4, removed in 3.14") + def test_deprecated_name_constants(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=True)), +@@ -530,6 +533,8 @@ def test_deprecated_name_constants(self): + ast.Assign(targets=[ast.Name(id='spam')], value=ast.NameConstant(value=None)), + "spam = None") + ++ @unittest.skipIf(sys.version_info >= (3, 14), ++ "Deprecated Constant nodes removed in Python 3.14") + def test_deprecated_constant_nodes(self): + self.assertAstEqualsSource( + ast.Assign(targets=[ast.Name(id='spam')], value=ast.Num(3)), |