Merge pull request #170 from rocky/python-3.14

Python 3.14

Author: rocky

.gitignore

@@ -28,6 +28,7 @@
 /.pytest_cache
 /.python-version
 /.tox
+.tox
 /.venv*/*
 /ChangeLog
 /ChangeLog-spell-corrected
@@ -51,3 +52,4 @@ com_crashlytics_export_strings.xml
 crashlytics-build.properties
 crashlytics.properties
 fabric.properties
+uv.lock

test_crossversion/Makefile

@@ -11,6 +11,7 @@ Crossversion xdis test usage:
 	clean        : remove compiled and serialized files
 	get_sources  : symlink all .py files in ./ -> $(SOURCE)
 	setup_pyenv  : setup local pyenv versions to be used by tox
+    setup_uv     : setup tox-uv to run tests with uv
 	compile      : with each tox env, compile all sources in $(SOURCE) to $(COMPILED), then serialize with dis to $(SERIALIZED)
 	prepare      : fully prepare test environment and compile test files
 	test         : prepare and run tests. with each tox env, serialize pyc's in $(COMPILED)<version> with xdis, then check against corresponding serialized pyc in $(SERIALIZED)<version>
@@ -37,12 +38,19 @@ get_sources:
 #: setup local pyenv versions to be used by tox
 setup_pyenv: .python-version
 
+#: setup tox-uv so tox can use uv
+setup_uv:
+	uv tool install tox --with tox-uv
+
 #: with each tox env, compile all sources in ./templates/source/ to ./templates/compiled/, then serialize with dis to ./templates/serialized/
 compile:
 	tox p -c ./tox_prepare.ini
 
+.prepare_msg:
+	@echo Ensure you have pyenv or uv installed and ran corresponding target setup_pyenv or setup_uv
+
 #: fully prepare tests
-prepare: clean get_sources setup_pyenv compile
+prepare: .prepare_msg clean get_sources compile
 
 #: prepare and run tests. with each tox env, serialize pyc's in ./templates/compiled/<version> with xdis, then check against corresponding dis serialized pyc in ./templates/serialized/<version>
 test: prepare

test_crossversion/USAGE.md

@@ -4,9 +4,32 @@ This is done by having a way to identically "serialize" important attributes in
 We then can check a diff between a serialized xdis and dis bytecode to find if xdis is parsing something incorrectly.
 Most tests should be ran using the makefile.
 
+# Parsing results
+When running `make test`, tox will serialize bytecode to be put into text form. Given a bytecode compiled in 3.11 and natively disassembled, we go through each of our test versions, say 3.9 ... 3.14, and disassemble the same 3.11 bytecode.
+Given the 3.11 serialized disasembly, disassembled from 3.11, we take the diff between that and a serialized 3.11 disassembled from any of our test versions.
+This lets us see if there are any differences in how xdis handles native vs cross version.
+
+This is repeated for every test version.
+```
+test_vers = (3.9, 3.10, 3.11, 3.12, 3.13)
+
+for native in test_vers:
+    for v in test_vers:
+        assert disasm(native) == disasm(v)
+```
+
+`make test` will run a series of pytests. If there is a failure, the left hand side is the native dis, and the right hand side is the xdis cross version. You will also see `case = 3.*`, this shows which version of python is being ran for that test.
+
+Pytest will fail early, so not all tests may be ran.
+
 # System Requirements
+- `uv`
+    - uv will handle everything on its own
+
+---OR---
+
 - `pyenv` and `pyenv-virtualenv`
-    - Each version needing to be tested should be installed with pyenv.
+    - Each version needing to be tested should be installed with pyenv
 - `tox`
 
 # Usage

test_crossversion/serialize_bytecode.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import dis
 import logging
 import sys
 from pathlib import Path

test_crossversion/test_xdis.py

@@ -59,15 +59,17 @@ def get_tests_by_version(v: str) -> Iterable[SerializedTestCase]:
         yield SerializedTestCase(compiled_test, serialized_test)
 
 
-# @pytest.mark.parametrize("version", get_versions())
-# def test_version(version):
-#     """Test each version in compiled template folder."""
-#     for case in get_tests_by_version(version):
-#         assert case.serialized_dis.splitlines() == case.serialized_xdis.splitlines()
-
-
-@pytest.mark.parametrize(
-    "case", chain.from_iterable(get_tests_by_version(v) for v in get_versions())
-)
-def test_case(case: SerializedTestCase) -> None:
-    assert case.serialized_dis.splitlines() == case.serialized_xdis.splitlines()
+### MORE VERBOSE ###
+@pytest.mark.parametrize("version", get_versions())
+def test_version(version):
+    """Test each version in compiled template folder."""
+    for case in get_tests_by_version(version):
+        assert case.serialized_dis.splitlines() == case.serialized_xdis.splitlines()
+
+
+### LESS VERBOSE (fail early) ###
+#@pytest.mark.parametrize(
+#    "case", chain.from_iterable(get_tests_by_version(v) for v in get_versions())
+#)
+#def test_case(case: SerializedTestCase) -> None:
+#    assert case.serialized_dis.splitlines() == case.serialized_xdis.splitlines()

test_crossversion/tox.ini

@@ -1,12 +1,12 @@
 [tox]
 min_version = 4.0
 # ENV LIST MUST BE COMMA SEPARATED LIST OF PYTHON VERSIONS
-env_list = 3.9, 3.10, 3.11, 3.12, 3.13
+env_list = 3.12, 3.13, 3.14
 
 [testenv]
 description = Check all permutations of python dis code objects with xdis code objects.
 deps =
-  -e=file:///{toxinidir}/../.
+  -e ../.
   pytest
 commands =
   pytest {tty:--color=yes} {posargs} ./test_xdis.py

test_crossversion/tox_prepare.ini

@@ -1,12 +1,12 @@
 [tox]
 min_version = 4.0
 # ENV LIST MUST BE COMMA SEPARATED LIST OF PYTHON VERSIONS
-env_list = 3.9, 3.10, 3.11, 3.12, 3.13
+env_list = 3.12, 3.13, 3.14
 
 [testenv]
 description = Compile and serialize source templates with dis
 deps =
-  -e=file:///{toxinidir}/../.
+  -e ../.
   pytest  # not needed but speeds up env creation
 commands =
   python ./prepare_templates.py {posargs} 

xdis/bytecode.py

@@ -363,6 +363,7 @@ def get_logical_instruction_at_offset(
             elif op in opc.LOCAL_OPS:
                 if opc.version_tuple >= (3, 13) and opname in (
                     "LOAD_FAST_LOAD_FAST",
+                    "LOAD_FAST_BORROW_LOAD_FAST_BORROW",
                     "STORE_FAST_LOAD_FAST",
                     "STORE_FAST_STORE_FAST",
                 ):

xdis/magics.py

@@ -647,10 +647,11 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 # Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST
 add_magic_from_int(3625, "3.14b3")
 
-# Fix miscompilation of some module-level annotations.
+# Fix missing exception handlers in logical expression
 add_magic_from_int(3626, "3.14rc2")
 
-# Fix miscompilation of some module-level annotations.
+# Fix miscompilation of some module-level annotations
+
 add_magic_from_int(3627, "3.14rc3")
 
 # Initial 3.15 version
@@ -844,7 +845,7 @@ def add_canonic_versions(release_versions: str, canonic: str) -> None:
 )
 
 add_canonic_versions(
-    "3.13 3.13.0 3.13.1 3.13.2 3.13.3 3.13.4 3.13.5 3.13.6 3.13.7 3.13.8 3.13.9",
+    "3.13 3.13.0 3.13.1 3.13.2 3.13.3 3.13.4 3.13.5 3.13.6 3.13.7 3.13.8 3.13.9 3.13.10",
     "3.13.0rc3",
 )