SLFO-pool/python-executing
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python-executing revision 830f7d8aa6c1f909b73574e4cfbd307b

Browse Source
This commit is contained in:
Adrian Schröter 2024-12-13 11:23:56 +01:00
parent 86a7ff4f7e
commit bb461d0d29
6 changed files with 286 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>test</package>
</multibuild>

BIN
executing-1.2.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
executing-2.1.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

147
new-python-312.patch Normal file
View File

@ -0,0 +1,147 @@
From 4acebfaa89196785ccc893d56b97ac8598c30e71 Mon Sep 17 00:00:00 2001
From: Frank Hoffmann <15r10nk-git@polarbit.de>
Date: Mon, 26 Aug 2024 21:43:13 +0200
Subject: [PATCH 1/2] fix: backward compatibility fix for changed source
positions in 3.12.6 (#85)
---
executing/_position_node_finder.py | 65 ++++++++++
tests/generate_small_sample.py | 9 -
tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py | 3
tests/test_main.py | 5
4 files changed, 79 insertions(+), 3 deletions(-)
--- a/executing/_position_node_finder.py
+++ b/executing/_position_node_finder.py
@@ -242,6 +242,66 @@ class PositionNodeFinder(object):
# keeping the old behaviour makes it possible to distinguish both cases.
return node.parent
+
+ if (
+ sys.version_info >= (3, 12, 6)
+ and instruction.opname in ("GET_ITER", "FOR_ITER")
+ and isinstance(
+ node.parent.parent,
+ (ast.ListComp, ast.SetComp, ast.DictComp, ast.GeneratorExp),
+ )
+ and isinstance(node.parent,ast.comprehension)
+ and node is node.parent.iter
+ ):
+ # same as above but only for comprehensions, see:
+ # https://github.com/python/cpython/issues/123142
+
+ return node.parent.parent
+
+ if sys.version_info >= (3, 12,6) and instruction.opname == "CALL":
+ before = self.instruction_before(instruction)
+ if (
+ before is not None
+ and before.opname == "LOAD_CONST"
+ and before.positions == instruction.positions
+ and isinstance(node.parent, ast.withitem)
+ and node is node.parent.context_expr
+ ):
+ # node positions for with-statements have change
+ # and is now equal to the expression which created the context-manager
+ # https://github.com/python/cpython/pull/120763
+
+ # with context_manager:
+ # ...
+
+ # but there is one problem to distinguish call-expressions from __exit__()
+
+ # with context_manager():
+ # ...
+
+ # the call for __exit__
+
+ # 20 1:5 1:22 LOAD_CONST(None)
+ # 22 1:5 1:22 LOAD_CONST(None)
+ # 24 1:5 1:22 LOAD_CONST(None)
+ # 26 1:5 1:22 CALL() # <-- same source range as context_manager()
+
+ # but we can use the fact that the previous load for None
+ # has the same source range as the call, wich can not happen for normal calls
+
+ # we return the same ast.With statement at the and to preserve backward compatibility
+
+ return node.parent.parent
+
+ if (
+ sys.version_info >= (3, 12,6)
+ and instruction.opname == "BEFORE_WITH"
+ and isinstance(node.parent, ast.withitem)
+ and node is node.parent.context_expr
+ ):
+ # handle positions changes for __enter__
+ return node.parent.parent
+
return node
def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None:
@@ -880,6 +940,11 @@ class PositionNodeFinder(object):
def instruction(self, index: int) -> Optional[dis.Instruction]:
return self.bc_dict.get(index,None)
+ def instruction_before(
+ self, instruction: dis.Instruction
+ ) -> Optional[dis.Instruction]:
+ return self.bc_dict.get(instruction.offset - 2, None)
+
def opname(self, index: int) -> str:
i=self.instruction(index)
if i is None:
--- a/tests/generate_small_sample.py
+++ b/tests/generate_small_sample.py
@@ -18,6 +18,7 @@ from rich.progress import Progress, trac
from rich.syntax import Syntax
from rich.console import Console
import argparse
+import ast
last_samples_dir = Path(__file__).parent / "last_samples"
last_samples_dir.mkdir(exist_ok=True)
@@ -64,6 +65,11 @@ def test_file(filename: Path):
test = TestFiles()
try:
+ ast.parse(code)
+ except (RecursionError,SyntaxError):
+ return True
+
+ try:
with open(os.devnull, "w") as dev_null:
with contextlib.redirect_stderr(dev_null):
with contextlib.redirect_stdout(dev_null):
@@ -122,9 +128,6 @@ def main():
break_file.unlink()
sys.exit(0)
- if time.time() > end_time:
- print("Timeout")
- sys.exit(0)
if not result:
print(f"{filename} is failing the tests -> minimize\n")
--- /dev/null
+++ b/tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py
@@ -0,0 +1,3 @@
+async def wait():
+ async with something:
+ pass
\ No newline at end of file
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -609,6 +609,11 @@ class TestStuff(unittest.TestCase):
assert {i: i for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
assert list(i for i in iter_test(ast.GeneratorExp)) == [1, 2]
+ assert [i for j in [0] for i in iter_test(ast.ListComp)] == [1, 2]
+ assert {i for j in [0] for i in iter_test(ast.SetComp)} == {1, 2}
+ assert {i: i for j in [0] for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
+ assert list(i for j in [0] for i in iter_test(ast.GeneratorExp)) == [1, 2]
+
for i in iter_test(ast.For):
assert i in (1, 2)

85
python-executing.changes
View File

@ -1,3 +1,88 @@
-------------------------------------------------------------------
Wed Oct 23 13:02:57 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
- Remove ipython dependency for Leap
-------------------------------------------------------------------
Thu Sep 26 09:27:25 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Split test run into separate build using _multibuild.
-------------------------------------------------------------------
Fri Sep 20 20:29:20 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- The test suite has to be run with pytest, unittest is not enough
- Add missing BuildRequires: ipython
-------------------------------------------------------------------
Wed Sep 18 06:18:15 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Add new-python-312.patch to fix build with recent Python 3.12 release
-------------------------------------------------------------------
Tue Sep 10 07:06:40 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.1.0
* Add many_calls tests to EXECUTING_SLOW_TESTS (#78)
* fix: backward compatibility fix for changed source positions in 3.12.5 (#82) (#83)
* fix(3.13): show_caches is deprecated
* fix(3.13): added new rules to the verification
* build(3.13): added 3.13 to ci workflow
* fix(3.13): fixed typing errors
* fix(3.13): handle STORE_FAST_STORE_FAST and similar instructions as known issues
* fix(3.13): loading of __class__ is mapped to the last element of the class
* fix(3.13): handle CALL_KW like method calls which are only located by the end position
* fix(3.13): a lambda can also have nonlocal variables
* fix(3.13): a async function can also have nonlocal variables
* fix(3.13): COMPARE_OP maps always to ast.Compare
* fix(3.13): a type variable can also have nonlocal variables
* test(3.13): handle optimization of `not not x`
* test: fixed tests for 3.13.0b1
* fix: allow to LOAD_FAST variables for TypeVars
* fix: skip files with raise an recursion error in 3.13,
because the recursion limit has no effect
* test(3.13): added sample_results
* test: skip module tests for now
* refactor: review changes
* fix: handle __firstlineno__
* fix: removed unused verification
* doc: review changes
* Catch exception if node is in unexpected statement (#84)
* test: optimized test preformance by moving deadcode check to the end (#89)
* add 3.13 to setup.cfg classifiers
- Drop support-new-python-3.12.patch, merged upstream
-------------------------------------------------------------------
Mon Aug 26 02:31:27 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Switch to autosetup macro.
- Add patch support-new-python-3.12.patch:
* Support Python 3.13 (and backported to 3.12.5) AST changes for For.
-------------------------------------------------------------------
Tue Nov 7 18:46:01 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 2.0.1:
* fix: self.fail() is only available in TestCase classes
* fix: mark expressions which can be evaluated at compile time
as deadcode
* fix: implemented DELETE_DEREF
* feat: 3.12 support for the PositionNodeFinder
* feat: support LOAD_CONST
* test: verify exception generation for asserts >= python 3.11.2
* test: skip test of module_files for the SentinelNodeFinder
* test: do not check qualnames for files with syntax errors
* fix: handle List/Set/DictComp inlining
* fix: handle super optimization
* fix: type parameter related things
* fix: f-string
* fix: disabled type checking for 3.12
* test: added test results for 3.12
* fix: workaround for a bug in six
* remove python2 code
* feat: support for __iter__
* feat: support for __next__
-------------------------------------------------------------------
Fri Apr 21 12:24:50 UTC 2023 - Dirk Müller <dmueller@suse.com>

64
python-executing.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-executing
#
# 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
@ -16,52 +16,78 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%define skip_python36 1
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
%else
%define psuffix %{nil}
%bcond_with test
%endif
%{?sle15_python_module_pythons}
Name: python-executing
Version: 1.2.0
Name: python-executing%{psuffix}
Version: 2.1.0
Release: 0
License: MIT
Summary: Get the currently executing AST node of a frame, and other information
License: MIT
URL: https://github.com/alexmojaki/executing
Group: Development/Languages/Python
#Source: https://github.com/alexmojaki/executing/archive/v%%{version}/%%{name}-%%{version}.tar.gz
Source: https://files.pythonhosted.org/packages/source/e/executing/executing-%{version}.tar.gz
BuildRequires: %{python_module asttokens}
# PATCH-FIX-UPSTREAM https://github.com/alexmojaki/executing/pull/86 fix: backward compatibility fix for changed source positions in 3.12.6
Patch0: new-python-312.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module littleutils}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools_scm >= 4.0.0}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module toml}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module asttokens}
%if 0%{?suse_version} > 1600
BuildRequires: %{python_module ipython}
%endif
BuildRequires: %{python_module littleutils}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module rich}
%endif
%python_subpackages
%description
Get the currently executing AST node of a frame, and other information
%prep
%setup -q -n executing-%{version}
%autosetup -p1 -n executing-%{version}
%build
%python_build
%if %{without test}
%pyproject_wheel
%endif
%install
%python_install
%if %{without test}
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
%check
%pyunittest discover -v
%if %{with test}
# Don't have ipython build requirement in Leap
%if 0%{?suse_version} <= 1600
%pytest -k "not test_ipython"
%else
%pytest
%endif
%endif
%if %{without test}
%files %{python_files}
%doc README.md
%license LICENSE.txt
%{python_sitelib}/*
%{python_sitelib}/executing
%{python_sitelib}/executing-%{version}.dist-info
%endif
%changelog