Merge branch 'main' into cythonize

Author: MatthieuDartiailh

.github/workflows/cis.yml

@@ -70,7 +70,7 @@ jobs:
         run: |
           tox
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         if: github.event_name != 'schedule'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
           pip install dist/*.tar.gz
           python -X dev -m pytest tests
       - name: Store artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: cibw-sdist
           path: dist/*
@@ -65,7 +65,7 @@ jobs:
           pip install dist/*.whl
           python -X dev -m pytest tests
       - name: Store artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: cibw-wheel-pure
           path: dist/*.whl
@@ -108,7 +108,7 @@ jobs:
       id-token: write
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v7.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           pattern: cibw-*
           path: dist
@@ -130,13 +130,13 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7.0.0
+      uses: actions/download-artifact@v8.0.1
       with:
         pattern: cibw-*
         path: dist
         merge-multiple: true
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v3.2.0
+      uses: sigstore/gh-action-sigstore-python@v3.3.0
       with:
         inputs: >-
           ./dist/*.tar.gz

.readthedocs.yaml

@@ -7,9 +7,9 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
-    python: "3.9"
+    python: "3.12"
 
 # Build documentation in the docs/source directory with Sphinx
 sphinx:

doc/changelog.rst

@@ -5,6 +5,8 @@ unreleased: Version 0.18.0
 --------------------------
 
 - drop support for Python 3.9 and 3.10 PR #180
+- Replace string literal type annotations with postponed evaluation using
+  ``from __future__ import annotations`` PR #191
 
 Bugfixes:
 

src/bytecode/bytecode.py

@@ -1,4 +1,5 @@
-# alias to keep the 'bytecode' variable free
+from __future__ import annotations
+
 import types
 from abc import abstractmethod
 from typing import (
@@ -15,6 +16,7 @@
     overload,
 )
 
+# alias to keep the 'bytecode' variable free
 import bytecode as _bytecode
 from bytecode.flags import CompilerFlags, infer_flags
 from bytecode.instr import (
@@ -48,7 +50,7 @@ def __init__(self) -> None:
         self.freevars: List[str] = []
         self._flags: CompilerFlags = CompilerFlags(0)
 
-    def _copy_attr_from(self, bytecode: "BaseBytecode") -> None:
+    def _copy_attr_from(self, bytecode: BaseBytecode) -> None:
         self.argcount = bytecode.argcount
         self.posonlyargcount = bytecode.posonlyargcount
         self.kwonlyargcount = bytecode.kwonlyargcount
@@ -275,7 +277,7 @@ def from_code(
         code: types.CodeType,
         prune_caches: bool = True,
         conserve_exception_block_stackdepth: bool = False,
-    ) -> "Bytecode":
+    ) -> Bytecode:
         concrete = _bytecode.ConcreteBytecode.from_code(code)
         return concrete.to_bytecode(
             prune_caches=prune_caches,
@@ -317,7 +319,7 @@ def to_concrete_bytecode(
         self,
         compute_jumps_passes: Optional[int] = None,
         compute_exception_stack_depths: bool = True,
-    ) -> "_bytecode.ConcreteBytecode":
+    ) -> _bytecode.ConcreteBytecode:
         converter = _bytecode._ConvertBytecodeToConcrete(self)
         return converter.to_concrete_bytecode(
             compute_jumps_passes=compute_jumps_passes,

src/bytecode/cfg.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import types
 from collections import defaultdict
 from dataclasses import dataclass
@@ -36,7 +38,7 @@ def __init__(
         ] = None,
     ) -> None:
         # a BasicBlock object, or None
-        self.next_block: Optional["BasicBlock"] = None
+        self.next_block: Optional[BasicBlock] = None
         if instructions:
             super().__init__(instructions)
 
@@ -129,7 +131,7 @@ def legalize(self, first_lineno: int) -> int:
 
         return current_lineno
 
-    def get_jump(self) -> Optional["BasicBlock"]:
+    def get_jump(self) -> Optional[BasicBlock]:
         if not self:
             return None
 
@@ -243,7 +245,7 @@ def __init__(
         self.pending_try_begin = pending_try_begin
         self._current_try_begin = pending_try_begin
 
-    def run(self) -> Generator[Union["_StackSizeComputer", int], int, None]:
+    def run(self) -> Generator[Union[_StackSizeComputer, int], int, None]:
         """Iterate over the block instructions to compute stack usage."""
         # Blocks are not hashable but in this particular context we know we won't be
         # modifying blocks in place so we can safely use their id as hash rather than
@@ -343,9 +345,11 @@ def run(self) -> Generator[Union["_StackSizeComputer", int], int, None]:
                     None,
                     # Do not propagate the TryBegin if a final instruction is followed
                     # by a TryEnd.
-                    None
-                    if instr.is_final() and self.block.get_trailing_try_end(i)
-                    else self._current_try_begin,
+                    (
+                        None
+                        if instr.is_final() and self.block.get_trailing_try_end(i)
+                        else self._current_try_begin
+                    ),
                 )
 
                 # Update the maximum used size by the usage implied by the following
@@ -362,8 +366,10 @@ def run(self) -> Generator[Union["_StackSizeComputer", int], int, None]:
                     # start with a TryEnd relevant only when reaching this block
                     # through a particular jump. So we are lenient here.
                     if (
-                        te := self.block.get_trailing_try_end(i)
-                    ) and te.entry is self._current_try_begin:
+                        (te := self.block.get_trailing_try_end(i))
+                        and self._current_try_begin is not None
+                        and te.entry is self._current_try_begin
+                    ):
                         assert isinstance(te.entry.target, BasicBlock)
                         yield from self._compute_exception_handler_stack_usage(
                             te.entry.target,
@@ -426,7 +432,7 @@ def _update_size(self, pre_delta: int, post_delta: int) -> None:
 
     def _compute_exception_handler_stack_usage(
         self, block: BasicBlock, push_lasti: bool
-    ) -> Generator[Union["_StackSizeComputer", int], int, None]:
+    ) -> Generator[Union[_StackSizeComputer, int], int, None]:
         b_id = id(block)
         if self.minsize < self.common.exception_block_startsize[b_id]:
             block_size = yield _StackSizeComputer(
@@ -737,7 +743,7 @@ def get_dead_blocks(self) -> List[BasicBlock]:
         return [b for b in self if id(b) not in seen_block_ids]
 
     @staticmethod
-    def from_bytecode(bytecode: _bytecode.Bytecode) -> "ControlFlowGraph":
+    def from_bytecode(bytecode: _bytecode.Bytecode) -> ControlFlowGraph:
         # label => instruction index
         label_to_block_index = {}
         jumps = []

src/bytecode/concrete.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import dis
 import inspect
 import itertools
@@ -332,7 +334,7 @@ def __eq__(self, other: Any) -> bool:
     @staticmethod
     def from_code(
         code: types.CodeType, *, extended_arg: bool = False
-    ) -> "ConcreteBytecode":
+    ) -> ConcreteBytecode:
         instructions: MutableSequence[Union[SetLineno, ConcreteInstr]] = []
         for i in dis.get_instructions(code, show_caches=True):
             loc = InstrLocation.from_positions(i.positions) if i.positions else None

src/bytecode/instr.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import dis
 import enum
 import opcode as _opcode
@@ -267,7 +269,7 @@ class CommonConstant(enum.IntEnum):
 # This make type checking happy but means it won't catch attempt to manipulate an unset
 # statically. We would need guard on object attribute narrowed down through methods
 class _UNSET(int):
-    instance: Optional["_UNSET"] = None
+    instance: Optional[_UNSET] = None
 
     def __new__(cls):
         if cls.instance is None:
@@ -611,7 +613,7 @@ def __init__(
                 )
 
     @classmethod
-    def from_positions(cls, position: "dis.Positions") -> "InstrLocation":  # type: ignore
+    def from_positions(cls, position: dis.Positions) -> InstrLocation:  # type: ignore
         return InstrLocation(
             position.lineno,
             position.end_lineno,
@@ -654,7 +656,7 @@ def __init__(
         self.push_lasti: bool = push_lasti
         self.stack_depth: int | _UNSET = stack_depth
 
-    def copy(self) -> "TryBegin":
+    def copy(self) -> TryBegin:
         return TryBegin(self.target, self.push_lasti, self.stack_depth)
 
 
@@ -664,7 +666,7 @@ class TryEnd:
     def __init__(self, entry: TryBegin) -> None:
         self.entry: TryBegin = entry
 
-    def copy(self) -> "TryEnd":
+    def copy(self) -> TryEnd:
         return TryEnd(self.entry)
 
 

tests/frameworks/module.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import abc
 import sys
 import typing as t
@@ -124,7 +126,7 @@ class BaseModuleWatchdog:
     Invokes ``after_import`` every time a new module is imported.
     """
 
-    _instance: t.Optional["BaseModuleWatchdog"] = None
+    _instance: t.Optional[BaseModuleWatchdog] = None
 
     def __init__(self) -> None:
         self._finding: t.Set[str] = set()