Skip to content

Commit e5d8db1

Browse files
committed
common-expression-language: carry forward riscv64 patches to 0.9.0, 0.10.0
Nightly version bump omitted the patches/common-expression-language/<version> directory for 0.9.0, 0.10.0, so the build's unconditional `git apply .../*.patch` step failed with "No such file or directory" before any build/test ran. Copied forward the same patch set from 0.8.0 (unchanged since then).
1 parent 186b735 commit e5d8db1

2 files changed

Lines changed: 94 additions & 0 deletions

File tree

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Ludovic Henry <git@ludovic.dev>
3+
Date: Sun, 4 Oct 2026 11:30:00 +0000
4+
Subject: [PATCH] cli: import Annotated from typing, not typing_extensions
5+
6+
Upstream-Status: Backport [https://github.com/hardbyte/python-common-expression-language/commit/212cf00c48b6dd1a7fe35ae092eee414b1825f01]
7+
8+
cel/__init__.py imports cel.cli, which imports Annotated from
9+
typing_extensions. typing_extensions is not a declared dependency; it
10+
used to arrive transitively through typer, but typer 0.21.2 dropped it,
11+
so `import cel` fails with "No module named 'typing_extensions'" in any
12+
clean environment. This reproduces on every architecture, not just
13+
riscv64.
14+
15+
Upstream fixed it in 212cf00 ("Fix `import cel` failing in a clean
16+
install", #44, released in 0.10.0) by importing Annotated from the
17+
standard library's typing module (Python >= 3.9; the package requires
18+
>= 3.11). This backports the python/cel/cli.py hunk of that commit.
19+
20+
Signed-off-by: Ludovic Henry <git@ludovic.dev>
21+
---
22+
python/cel/cli.py | 3 +--
23+
1 file changed, 1 insertion(+), 2 deletions(-)
24+
25+
diff --git a/python/cel/cli.py b/python/cel/cli.py
26+
index 22ea1e1..216cc38 100644
27+
--- a/python/cel/cli.py
28+
+++ b/python/cel/cli.py
29+
@@ -16,7 +16,7 @@ import sys
30+
import time
31+
from importlib.metadata import PackageNotFoundError, version
32+
from pathlib import Path
33+
-from typing import Any, Dict, Optional, Tuple
34+
+from typing import Annotated, Any, Dict, Optional, Tuple
35+
36+
import typer
37+
38+
@@ -35,7 +35,6 @@ from rich.console import Console
39+
from rich.panel import Panel
40+
from rich.syntax import Syntax
41+
from rich.table import Table
42+
-from typing_extensions import Annotated
43+
44+
# Import directly from relative modules to avoid circular imports
45+
from .cel import Context, evaluate
46+
--
47+
2.43.0
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Ludovic Henry <git@ludovic.dev>
3+
Date: Sun, 4 Oct 2026 11:30:00 +0000
4+
Subject: [PATCH] cli: import Annotated from typing, not typing_extensions
5+
6+
Upstream-Status: Backport [https://github.com/hardbyte/python-common-expression-language/commit/212cf00c48b6dd1a7fe35ae092eee414b1825f01]
7+
8+
cel/__init__.py imports cel.cli, which imports Annotated from
9+
typing_extensions. typing_extensions is not a declared dependency; it
10+
used to arrive transitively through typer, but typer 0.21.2 dropped it,
11+
so `import cel` fails with "No module named 'typing_extensions'" in any
12+
clean environment. This reproduces on every architecture, not just
13+
riscv64.
14+
15+
Upstream fixed it in 212cf00 ("Fix `import cel` failing in a clean
16+
install", #44, released in 0.10.0) by importing Annotated from the
17+
standard library's typing module (Python >= 3.9; the package requires
18+
>= 3.11). This backports the python/cel/cli.py hunk of that commit.
19+
20+
Signed-off-by: Ludovic Henry <git@ludovic.dev>
21+
---
22+
python/cel/cli.py | 3 +--
23+
1 file changed, 1 insertion(+), 2 deletions(-)
24+
25+
diff --git a/python/cel/cli.py b/python/cel/cli.py
26+
index 22ea1e1..216cc38 100644
27+
--- a/python/cel/cli.py
28+
+++ b/python/cel/cli.py
29+
@@ -16,7 +16,7 @@ import sys
30+
import time
31+
from importlib.metadata import PackageNotFoundError, version
32+
from pathlib import Path
33+
-from typing import Any, Dict, Optional, Tuple
34+
+from typing import Annotated, Any, Dict, Optional, Tuple
35+
36+
import typer
37+
38+
@@ -35,7 +35,6 @@ from rich.console import Console
39+
from rich.panel import Panel
40+
from rich.syntax import Syntax
41+
from rich.table import Table
42+
-from typing_extensions import Annotated
43+
44+
# Import directly from relative modules to avoid circular imports
45+
from .cel import Context, evaluate
46+
--
47+
2.43.0

0 commit comments

Comments
 (0)