From 77b6be5ecc385bb0924ed17c8ef89627aae2b76775a20ce3e1fc7eed8dfa4ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 11 Sep 2024 06:18:25 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-executing?expand=0&rev=15 --- .gitattributes | 23 ++++++ .gitignore | 1 + executing-2.0.1.tar.gz | 3 + executing-2.1.0.tar.gz | 3 + python-executing.changes | 142 ++++++++++++++++++++++++++++++++++ python-executing.spec | 62 +++++++++++++++ support-new-python-3.12.patch | 116 +++++++++++++++++++++++++++ 7 files changed, 350 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 executing-2.0.1.tar.gz create mode 100644 executing-2.1.0.tar.gz create mode 100644 python-executing.changes create mode 100644 python-executing.spec create mode 100644 support-new-python-3.12.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/executing-2.0.1.tar.gz b/executing-2.0.1.tar.gz new file mode 100644 index 0000000..82c0b44 --- /dev/null +++ b/executing-2.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147 +size 836501 diff --git a/executing-2.1.0.tar.gz b/executing-2.1.0.tar.gz new file mode 100644 index 0000000..ed6be13 --- /dev/null +++ b/executing-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab +size 977485 diff --git a/python-executing.changes b/python-executing.changes new file mode 100644 index 0000000..82b0d92 --- /dev/null +++ b/python-executing.changes @@ -0,0 +1,142 @@ +------------------------------------------------------------------- +Tue Sep 10 07:06:40 UTC 2024 - John Paul Adrian Glaubitz + +- 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 + +- 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 + +- 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 + +- add sle15_python_module_pythons (jsc#PED-68) + +------------------------------------------------------------------- +Thu Apr 13 22:41:09 UTC 2023 - Matej Cepl + +- Make calling of %{sle15modernpython} optional. + +------------------------------------------------------------------- +Fri Dec 2 17:32:34 UTC 2022 - Yogalakshmi Arunachalam + +- Update to 1.2.0 + Merge pull request #56 from alexmojaki/init_tokens + Use new asttokens.ASTText + +- Update to 1.1.1 + tox is breaking weirdly with too much parallelism + +- Update to 1.1.0 + 3.11 in setup.cfg + +- Update to 1.0.0 + Merge pull request #46 from alexmojaki/checkcache + Always check linecache + +- Update to 0.10.0 + Merge pull request #45 from alexmojaki/reload + Clear caches when modules are reloaded + +- Update to 0.9.1 + Merge pull request #41 from alexmojaki/node_linenos + Extract node_linenos to account for end_lineno and use in assert_linenos + +- Update to 0.9.0 + * Merge pull request #38 from alexmojaki/pwwang/master + Support STORE_ATTR and STORE_SUBSCR + +------------------------------------------------------------------- +Sun Mar 27 10:48:50 UTC 2022 - Dirk Müller + +- update to 0.8.3: + * handle new iphython cell code names + * link to futurecoder + +------------------------------------------------------------------- +Thu Dec 2 12:42:43 UTC 2021 - Guillaume GARDET + +- Skip python 3.6 since python-asttokens dropped it + +------------------------------------------------------------------- +Tue Nov 2 13:47:37 UTC 2021 - pgajdos@suse.com + +- version update to 0.8.2 + * no upstream changelog +- %check: use %pyunittest rpm macro + +------------------------------------------------------------------- +Wed Dec 2 20:23:30 UTC 2020 - ecsos + +- Update to 0.5.3 + - Handle pypy saying the current instruction is an extended arg +- Changes from 0.5.2 + - Convert path to string before checking filename cache +- Changes from 0.5.1 + - Get top level statement containing IPython node +- Changes from 0.5.0 + - Also cache Source objects by contents (lines) +- Changes from 0.4.4 + - Move packaging metadata into setup.cfg +- Changes from 0.4.3 + - Bump to 0.4.3 + +------------------------------------------------------------------- +Wed Mar 11 09:51:32 PM UTC 2020 - John Vandenberg + +- Initial spec for v0.4.2 diff --git a/python-executing.spec b/python-executing.spec new file mode 100644 index 0000000..1d3be0d --- /dev/null +++ b/python-executing.spec @@ -0,0 +1,62 @@ +# +# spec file for package python-executing +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{?sle15_python_module_pythons} +Name: python-executing +Version: 2.1.0 +Release: 0 +Summary: Get the currently executing AST node of a frame, and other information +License: MIT +URL: https://github.com/alexmojaki/executing +Source: https://files.pythonhosted.org/packages/source/e/executing/executing-%{version}.tar.gz +BuildRequires: %{python_module asttokens} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module littleutils} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools_scm >= 4.0.0} +BuildRequires: %{python_module toml} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildArch: noarch +%python_subpackages + +%description +Get the currently executing AST node of a frame, and other information + +%prep +%autosetup -p1 -n executing-%{version} + +%build +%pyproject_wheel + +%install +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +%check +%pyunittest discover -v + +%files %{python_files} +%doc README.md +%license LICENSE.txt +%{python_sitelib}/executing +%{python_sitelib}/executing-%{version}.dist-info + +%changelog diff --git a/support-new-python-3.12.patch b/support-new-python-3.12.patch new file mode 100644 index 0000000..ce28561 --- /dev/null +++ b/support-new-python-3.12.patch @@ -0,0 +1,116 @@ +From 0b913873b9db8c157a8dd581e8771242bcb8864b Mon Sep 17 00:00:00 2001 +From: Frank Hoffmann <15r10nk-git@polarbit.de> +Date: Fri, 16 Aug 2024 22:51:32 +0200 +Subject: [PATCH 1/4] fix: backward compatibility fix for changed source + positions in 3.12.5 (#82) + +--- + executing/_position_node_finder.py | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +Index: executing-2.0.1/executing/_position_node_finder.py +=================================================================== +--- executing-2.0.1.orig/executing/_position_node_finder.py ++++ executing-2.0.1/executing/_position_node_finder.py +@@ -156,6 +156,8 @@ class PositionNodeFinder(object): + typ=typ, + ) + ++ self.result = self.fix_result(self.result, self.instruction(lasti)) ++ + self.known_issues(self.result, self.instruction(lasti)) + + self.test_for_decorator(self.result, lasti) +@@ -213,6 +215,32 @@ class PositionNodeFinder(object): + if sys.version_info < (3, 12): + index += 4 + ++ def fix_result( ++ self, node: EnhancedAST, instruction: dis.Instruction ++ ) -> EnhancedAST: ++ if ( ++ sys.version_info >= (3, 12, 5) ++ and instruction.opname in ("GET_ITER", "FOR_ITER") ++ and isinstance(node.parent, ast.For) ++ and node is node.parent.iter ++ ): ++ # node positions have changed in 3.12.5 ++ # https://github.com/python/cpython/issues/93691 ++ # `for` calls __iter__ and __next__ during execution, the calling ++ # expression of these calls was the ast.For node since cpython 3.11 (see test_iter). ++ # cpython 3.12.5 changed this to the `iter` node of the loop, to make tracebacks easier to read. ++ # This keeps backward compatibility with older executing versions. ++ ++ # there are also cases like: ++ # ++ # for a in iter(l): pass ++ # ++ # where `iter(l)` would be otherwise the resulting node for the `iter()` call and the __iter__ call of the for implementation. ++ # keeping the old behaviour makes it possible to distinguish both cases. ++ ++ return node.parent ++ return node ++ + def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None: + if instruction.opname in ("COMPARE_OP", "IS_OP", "CONTAINS_OP") and isinstance( + node, types_cmp_issue +Index: executing-2.0.1/.github/workflows/test.yml +=================================================================== +--- executing-2.0.1.orig/.github/workflows/test.yml ++++ executing-2.0.1/.github/workflows/test.yml +@@ -12,7 +12,7 @@ jobs: + runs-on: ubuntu-20.04 + strategy: + matrix: +- python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', 3.11, 3.12-dev, pypy-3.6] ++ python-version: [3.8, 3.9, '3.10', 3.11, 3.12-dev] + + steps: + - uses: actions/checkout@v2 +Index: executing-2.0.1/setup.cfg +=================================================================== +--- executing-2.0.1.orig/setup.cfg ++++ executing-2.0.1/setup.cfg +@@ -25,7 +25,7 @@ packages = executing + zip_safe = False + include_package_data = True + setup_requires = setuptools; setuptools_scm[toml] +-python_requires = >=3.5 ++python_requires = >=3.8 + + [options.extras_require] + tests = +Index: executing-2.0.1/tox.ini +=================================================================== +--- executing-2.0.1.orig/tox.ini ++++ executing-2.0.1/tox.ini +@@ -1,5 +1,5 @@ + [tox] +-envlist = py35,py36,py37,py38,py39,py310,py311,py312,pypy35,pypy36 ++envlist = py38,py39,py310,py311,py312,pypy35,pypy36 + + [testenv] + commands = +@@ -10,7 +10,7 @@ passenv = + ADD_EXECUTING_TESTS + EXECUTING_SLOW_TESTS + +-[testenv:generate_small_sample-py{35,36,37,38,39,310,311}] ++[testenv:generate_small_sample-py{38,39,310,311,312}] + extras = tests + deps = pysource-minimize + commands = +Index: executing-2.0.1/tests/test_main.py +=================================================================== +--- executing-2.0.1.orig/tests/test_main.py ++++ executing-2.0.1/tests/test_main.py +@@ -802,6 +802,9 @@ class TestFiles: + or 'pyparsing.py' in filename + or 'enum' in filename + ) ++ or sys.version_info < (3,11) and ( ++ 'python.py' in filename ++ ) + ): + continue +