Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

chore: drop python 3.10 support (#11437)

Dylan Madisetti552658c155f9
diff --git a/.github/workflows/test_be.yaml b/.github/workflows/test_be.yaml
index 96cf19d64f..9fdef6e6d0 100644
--- a/.github/workflows/test_be.yaml
+++ b/.github/workflows/test_be.yaml
@@ -115,13 +115,11 @@ jobs:
strategy:
# Keep targets aligned with tool.uv.required-environments in pyproject.toml.
matrix:
- python-version: ["3.10"]
+ python-version: ["3.11"]
dependencies: ["core", "core,optional"]
include:
- - python-version: "3.10"
- dependencies: "minimal"
- python-version: "3.11"
- dependencies: "core"
+ dependencies: "minimal"
- python-version: "3.12"
dependencies: "core"
- python-version: "3.13"
@@ -130,8 +128,6 @@ jobs:
dependencies: "core"
- python-version: "3.15"
dependencies: "core"
- - python-version: "3.11"
- dependencies: "core,optional"
- python-version: "3.12"
dependencies: "core,optional"
- python-version: "3.13"
@@ -155,7 +151,7 @@ jobs:
strategy:
# Keep targets aligned with tool.uv.required-environments in pyproject.toml.
matrix:
- python-version: ["3.10"]
+ python-version: ["3.11"]
dependencies: ["core", "core,optional"]
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
@@ -175,7 +171,7 @@ jobs:
strategy:
# Keep targets aligned with tool.uv.required-environments in pyproject.toml.
matrix:
- python-version: ["3.10"]
+ python-version: ["3.11"]
dependencies: ["core", "core,optional"]
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
diff --git a/.github/workflows/test_no_build.yaml b/.github/workflows/test_no_build.yaml
index f3ea1348b4..e573309d99 100644
--- a/.github/workflows/test_no_build.yaml
+++ b/.github/workflows/test_no_build.yaml
@@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+ python-version: ["3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
diff --git a/docs/scripts/generate_llms_txt.py b/docs/scripts/generate_llms_txt.py
index c1702ac0ba..343c3124f0 100644
--- a/docs/scripts/generate_llms_txt.py
+++ b/docs/scripts/generate_llms_txt.py
@@ -15,7 +15,7 @@ Run this after `html_to_markdown.py` so the `.md` files exist:
"""
# /// script
-# requires-python = ">=3.10"
+# requires-python = ">=3.11"
# dependencies = ["mkdocs>=1.6.1"]
# ///
diff --git a/marimo/_ast/visitor.py b/marimo/_ast/visitor.py
index 99a7adcdd3..5b5e806a0a 100644
--- a/marimo/_ast/visitor.py
+++ b/marimo/_ast/visitor.py
@@ -523,11 +523,7 @@ class ScopedVisitor(ast.NodeVisitor):
self.visit(node.value)
self.visit(node.key)
self._pop_block()
- elif isinstance(node, ast.Try) or (
- sys.version_info >= (3, 11) and isinstance(node, ast.TryStar)
- ):
- if sys.version_info < (3, 11):
- assert isinstance(node, ast.Try)
+ elif isinstance(node, (ast.Try, ast.TryStar)):
# "Try" nodes have "handlers" that introduce exception context
# variables that are tied to the try block, and don't exist beyond
# it.
diff --git a/marimo/_cli/export/live_notebook_server.py b/marimo/_cli/export/live_notebook_server.py
index 4c885087a2..b19e4750a7 100644
--- a/marimo/_cli/export/live_notebook_server.py
+++ b/marimo/_cli/export/live_notebook_server.py
@@ -15,7 +15,7 @@ from marimo import _loggers
from marimo._utils.net import find_free_port
if TYPE_CHECKING:
- from typing_extensions import Self
+ from typing import Self
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_code_mode/_context.py b/marimo/_code_mode/_context.py
index de6b0521da..596ae3fcec 100644
--- a/marimo/_code_mode/_context.py
+++ b/marimo/_code_mode/_context.py
@@ -104,8 +104,7 @@ if TYPE_CHECKING:
from collections.abc import Callable, Iterator, Sequence
from os import PathLike
from types import TracebackType
-
- from typing_extensions import Self
+ from typing import Self
from marimo._ast.cell_manager import CellManager
from marimo._code_mode.screenshot import _ScreenshotSession
diff --git a/marimo/_config/config.py b/marimo/_config/config.py
index d8b0d03992..c1e799cfc9 100644
--- a/marimo/_config/config.py
+++ b/marimo/_config/config.py
@@ -3,8 +3,15 @@
# ruff: noqa: PLC0414
from __future__ import annotations
-import sys
from dataclasses import dataclass
+from typing import (
+ TYPE_CHECKING,
+ Any,
+ Literal,
+ NotRequired,
+ TypedDict,
+ cast,
+)
from marimo._config.config_schema import MarimoConfig as MarimoConfigSchema
from marimo._config.types import (
@@ -20,20 +27,6 @@ from marimo._config.types import (
WidthType as WidthType,
)
from marimo._config.utils import deep_copy
-
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
-
-from typing import (
- TYPE_CHECKING,
- Any,
- Literal,
- TypedDict,
- cast,
-)
-
from marimo._output.rich_help import mddoc
from marimo._utils.deep_merge import deep_merge
diff --git a/marimo/_config/schema_utils.py b/marimo/_config/schema_utils.py
index a7b21aa130..6a24a3664b 100644
--- a/marimo/_config/schema_utils.py
+++ b/marimo/_config/schema_utils.py
@@ -4,11 +4,11 @@
from __future__ import annotations
import copy
-import sys
from typing import (
Annotated,
Any,
ClassVar,
+ Self,
get_args,
get_origin,
get_type_hints,
@@ -18,11 +18,6 @@ import msgspec
from msgspec import UNSET, Meta
from msgspec.structs import fields
-if sys.version_info >= (3, 11):
- from typing import Self
-else:
- from typing_extensions import Self
-
def default_if_unset(value: Any, default: Any) -> Any:
"""Use a fallback only for absent values, preserving explicit None."""
diff --git a/marimo/_core/stream.py b/marimo/_core/stream.py
index 805ef8e45e..a64b72abec 100644
--- a/marimo/_core/stream.py
+++ b/marimo/_core/stream.py
@@ -15,7 +15,7 @@ from collections.abc import Callable, Collection, Iterator
from contextlib import AbstractContextManager, contextmanager
from copy import deepcopy
from dataclasses import dataclass, replace
-from datetime import datetime, timezone
+from datetime import UTC, datetime
import msgspec
from msgspec import UNSET
@@ -44,7 +44,7 @@ def snapshot_event(
def utcnow() -> datetime:
- return datetime.now(timezone.utc)
+ return datetime.now(UTC)
def removal(
diff --git a/marimo/_data/_external_storage/storage.py b/marimo/_data/_external_storage/storage.py
index b6858382b2..ebe7b0aaad 100644
--- a/marimo/_data/_external_storage/storage.py
+++ b/marimo/_data/_external_storage/storage.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
import re
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
from functools import cached_property
from typing import TYPE_CHECKING, Any, Literal, cast
@@ -407,9 +407,7 @@ class FsspecFilesystem(StorageBackend["AbstractFileSystem"]):
# fsspec times are UTC, so treat naive datetimes as UTC
mtime = file.get("mtime")
if isinstance(mtime, datetime):
- mtime = mtime.replace(
- tzinfo=mtime.tzinfo or timezone.utc
- ).timestamp()
+ mtime = mtime.replace(tzinfo=mtime.tzinfo or UTC).timestamp()
# Entries listed from the "." fallback are prefixed with "./"
resolved_path = (name or "").removeprefix("./")
diff --git a/marimo/_export/_html_asset_server.py b/marimo/_export/_html_asset_server.py
index e5107232ad..ed6e6264ab 100644
--- a/marimo/_export/_html_asset_server.py
+++ b/marimo/_export/_html_asset_server.py
@@ -10,8 +10,7 @@ from typing import TYPE_CHECKING, Any, cast
if TYPE_CHECKING:
from pathlib import Path
from types import TracebackType
-
- from typing_extensions import Self
+ from typing import Self
class _HtmlAssetRequestHandler(SimpleHTTPRequestHandler):
diff --git a/marimo/_plugins/ui/_impl/plotly.py b/marimo/_plugins/ui/_impl/plotly.py
index bfdeff8228..88ed2cee6e 100644
--- a/marimo/_plugins/ui/_impl/plotly.py
+++ b/marimo/_plugins/ui/_impl/plotly.py
@@ -57,7 +57,7 @@ def _is_orderable_value(value: Any) -> bool:
# Check for ISO format datetime strings (sent from frontend via JSON)
if isinstance(value, str):
try:
- datetime.datetime.fromisoformat(value.replace("Z", "+00:00"))
+ datetime.datetime.fromisoformat(value)
return True
except (ValueError, AttributeError):
pass
@@ -78,9 +78,7 @@ def _parse_datetime_bound(value: Any) -> Any:
if isinstance(value, str):
try:
- return datetime.datetime.fromisoformat(
- value.replace("Z", "+00:00")
- )
+ return datetime.datetime.fromisoformat(value)
except (ValueError, AttributeError):
pass
@@ -123,9 +121,7 @@ def _is_orderable_axis(arr: Any, bound_value: Any) -> bool:
# Check for ISO format datetime strings (sent from frontend via JSON)
if isinstance(bound_value, str):
try:
- datetime.datetime.fromisoformat(
- bound_value.replace("Z", "+00:00")
- )
+ datetime.datetime.fromisoformat(bound_value)
return True
except (ValueError, AttributeError):
pass
@@ -139,9 +135,9 @@ def _to_numeric_coord(value: Any) -> float | None:
def _to_utc_timestamp(dt: datetime.datetime) -> float:
if dt.tzinfo is None:
- dt = dt.replace(tzinfo=datetime.timezone.utc)
+ dt = dt.replace(tzinfo=datetime.UTC)
else:
- dt = dt.astimezone(datetime.timezone.utc)
+ dt = dt.astimezone(datetime.UTC)
return dt.timestamp()
if isinstance(value, (int, float)):
@@ -153,7 +149,7 @@ def _to_numeric_coord(value: Any) -> float | None:
datetime.datetime.combine(
value,
datetime.time(),
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
)
)
if isinstance(value, str):
@@ -165,7 +161,7 @@ def _to_numeric_coord(value: Any) -> float | None:
datetime.datetime.combine(
parsed,
datetime.time(),
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
)
)
return None
diff --git a/marimo/_plugins/ui/_impl/tables/narwhals_table.py b/marimo/_plugins/ui/_impl/tables/narwhals_table.py
index 97a3acb8a1..f733833999 100644
--- a/marimo/_plugins/ui/_impl/tables/narwhals_table.py
+++ b/marimo/_plugins/ui/_impl/tables/narwhals_table.py
@@ -769,9 +769,7 @@ class NarwhalsTableManager(
bin_end = datetime.date.fromtimestamp(bin_end / ms_time)
except (OSError, OverflowError, ValueError):
# Fall back to timedelta calculation for old dates
- epoch = datetime.datetime(
- 1970, 1, 1, tzinfo=datetime.timezone.utc
- )
+ epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)
bin_end_dt = epoch + datetime.timedelta(
seconds=bin_end / ms_time
)
@@ -785,9 +783,7 @@ class NarwhalsTableManager(
)
except (OSError, OverflowError, ValueError):
# Fall back to timedelta calculation for old dates
- epoch = datetime.datetime(
- 1970, 1, 1, tzinfo=datetime.timezone.utc
- )
+ epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)
bin_end = epoch + datetime.timedelta(
seconds=bin_end / ms_time
)
diff --git a/marimo/_runtime/_wasm/_concurrency/_mp_pool.py b/marimo/_runtime/_wasm/_concurrency/_mp_pool.py
index 22f349e446..1cb26b4cd3 100644
--- a/marimo/_runtime/_wasm/_concurrency/_mp_pool.py
+++ b/marimo/_runtime/_wasm/_concurrency/_mp_pool.py
@@ -21,8 +21,7 @@ from marimo._runtime._wasm._concurrency._wait import (
if TYPE_CHECKING:
from collections.abc import Callable, Iterable
-
- from typing_extensions import Self
+ from typing import Self
class AsyncPoolResult:
diff --git a/marimo/_runtime/copy.py b/marimo/_runtime/copy.py
index 97059fdeea..47e638efce 100644
--- a/marimo/_runtime/copy.py
+++ b/marimo/_runtime/copy.py
@@ -14,7 +14,7 @@ from typing import (
)
if TYPE_CHECKING:
- from typing_extensions import Self
+ from typing import Self
T = TypeVar("T")
Ref = weakref.ReferenceType[T] | Callable[[], T]
diff --git a/marimo/_runtime/runner/scheduler.py b/marimo/_runtime/runner/scheduler.py
index f93eb2c7d5..08f018a12e 100644
--- a/marimo/_runtime/runner/scheduler.py
+++ b/marimo/_runtime/runner/scheduler.py
@@ -40,8 +40,7 @@ if TYPE_CHECKING:
Sequence,
)
from contextlib import AbstractAsyncContextManager
-
- from typing_extensions import Self
+ from typing import Self
from marimo._runtime.dataflow import DirectedGraph
from marimo._runtime.runner.result import RunResult
diff --git a/marimo/_runtime/watch/_path.py b/marimo/_runtime/watch/_path.py
index 128307cce4..674d5cfc17 100644
--- a/marimo/_runtime/watch/_path.py
+++ b/marimo/_runtime/watch/_path.py
@@ -1,10 +1,9 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-import sys
import threading
from pathlib import Path
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any, Self, TypeVar
from marimo import _loggers
from marimo._runtime.context import (
@@ -22,12 +21,6 @@ if TYPE_CHECKING:
LOGGER = _loggers.marimo_logger()
-if sys.version_info >= (3, 11):
- from typing import Self
-else:
- from typing_extensions import Self
-
-
T = TypeVar("T")
WATCHER_SLEEP_INTERVAL = 1.0
diff --git a/marimo/_save/manifest.py b/marimo/_save/manifest.py
index 41242de7af..505e972b53 100644
--- a/marimo/_save/manifest.py
+++ b/marimo/_save/manifest.py
@@ -19,7 +19,7 @@ import json
import os
import re
from dataclasses import dataclass, field
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from pathlib import Path
from typing import TYPE_CHECKING, Any
@@ -338,7 +338,7 @@ def _notebook_ref(notebook_path: str, store: Store) -> str:
def _utc_now() -> str:
- return datetime.now(timezone.utc).isoformat()
+ return datetime.now(UTC).isoformat()
def _read_str(payload: dict[str, Any], field_name: str) -> str:
diff --git a/marimo/_save/save.py b/marimo/_save/save.py
index 2120b98b51..45b305ce89 100644
--- a/marimo/_save/save.py
+++ b/marimo/_save/save.py
@@ -74,8 +74,7 @@ from marimo._utils.with_skip import SkipContext
if TYPE_CHECKING:
from collections.abc import Coroutine
from types import FrameType, TracebackType
-
- from typing_extensions import Self
+ from typing import Self
from marimo._runtime.context import RuntimeContext
from marimo._save.stores import Store
diff --git a/marimo/_schemas/islands.py b/marimo/_schemas/islands.py
index ed8a34a931..4bf034b1e2 100644
--- a/marimo/_schemas/islands.py
+++ b/marimo/_schemas/islands.py
@@ -1,13 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-import sys
-from typing import Literal, TypedDict
-
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
+from typing import Literal, NotRequired, TypedDict
ISLANDS_JSON_SCRIPT_TYPE: str = "application/vnd.marimo.islands+json"
ISLANDS_JSON_SCHEMA_VERSION: Literal[1] = 1
diff --git a/marimo/_schemas/session.py b/marimo/_schemas/session.py
index 0e02e54488..166d5d2d62 100644
--- a/marimo/_schemas/session.py
+++ b/marimo/_schemas/session.py
@@ -10,13 +10,7 @@ It may be externally used and must be kept backwards compatible.
from __future__ import annotations
-import sys
-from typing import Any, Literal
-
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
+from typing import Any, Literal, NotRequired
from marimo._messaging.mimetypes import KnownMimeType
from marimo._schemas.common import BaseDict
diff --git a/marimo/_server/ai/mcp/client.py b/marimo/_server/ai/mcp/client.py
index c14951a3cf..5897bd5dbc 100644
--- a/marimo/_server/ai/mcp/client.py
+++ b/marimo/_server/ai/mcp/client.py
@@ -349,7 +349,7 @@ class MCPClient:
except asyncio.CancelledError:
await cancel_and_wait(connection_task)
raise
- except asyncio.TimeoutError:
+ except TimeoutError:
# A lifecycle can time out before it reaches disconnect_event.
# Letting it continue would make refresh and shutdown wait on a
# task that they cannot signal, so a timeout is terminal.
@@ -537,7 +537,7 @@ class MCPClient:
# Return the MCP SDK result directly (may already be an error).
return result
- except asyncio.TimeoutError:
+ except TimeoutError:
error_msg = f"Tool {namespaced_tool_name} timed out after {connection.definition.timeout} seconds"
LOGGER.error(error_msg)
@@ -753,7 +753,7 @@ class MCPClient:
return True
- except asyncio.TimeoutError:
+ except TimeoutError:
LOGGER.warning(
f"Health check ping timed out after {self.health_check_timeout} seconds for {server_name}"
)
diff --git a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
index 8a338acc0d..ae4aac6bca 100644
--- a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
+++ b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
@@ -2,7 +2,6 @@
from __future__ import annotations
import asyncio
-import sys
from typing import TYPE_CHECKING, Any
from marimo import _loggers
@@ -26,8 +25,6 @@ if TYPE_CHECKING:
LOGGER = _loggers.marimo_logger()
-LORO_ALLOWED = sys.version_info >= (3, 11)
-
# Strong refs so fire-and-forget tasks aren't GC'd mid-flight.
_background_tasks: set[asyncio.Task[Any]] = set()
@@ -155,7 +152,7 @@ def is_rtc_available() -> bool:
Returns:
True if Loro is available, False otherwise.
"""
- return LORO_ALLOWED and DependencyManager.loro.has()
+ return DependencyManager.loro.has()
def _should_init_rtc(rtc_enabled: bool, mode: SessionMode) -> bool:
@@ -187,9 +184,7 @@ def _try_init_rtc_doc(
file_key: File key for the document
doc_manager: LoroDoc manager
"""
- if not LORO_ALLOWED:
- LOGGER.warning("RTC: Python version is not supported (requires 3.11+)")
- elif not DependencyManager.loro.has():
+ if not DependencyManager.loro.has():
LOGGER.warning(
"RTC: Loro is not installed, disabling real-time collaboration"
)
diff --git a/marimo/_server/api/endpoints/ws_endpoint.py b/marimo/_server/api/endpoints/ws_endpoint.py
index 09f385fc7c..3eebc04d3e 100644
--- a/marimo/_server/api/endpoints/ws_endpoint.py
+++ b/marimo/_server/api/endpoints/ws_endpoint.py
@@ -1,7 +1,6 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-import sys
from contextlib import aclosing
from typing import TYPE_CHECKING
@@ -37,8 +36,6 @@ if TYPE_CHECKING:
LOGGER = _loggers.marimo_logger()
-LORO_ALLOWED = sys.version_info >= (3, 11)
-
router = APIRouter()
DOC_MANAGER = LoroDocManager()
@@ -179,13 +176,8 @@ async def ws_sync(
return
# Check if Loro is available
- if not (LORO_ALLOWED and DependencyManager.loro.has()):
- if not LORO_ALLOWED:
- LOGGER.warning(
- "RTC: Python version is not supported (requires 3.11+)"
- )
- else:
- LOGGER.warning("RTC: Loro is not installed, closing websocket")
+ if not DependencyManager.loro.has():
+ LOGGER.warning("RTC: Loro is not installed, closing websocket")
await websocket.close(
WebSocketCodes.NORMAL_CLOSE,
WebSocketCloseReason.LORO_NOT_INSTALLED,
diff --git a/marimo/_server/host/api.py b/marimo/_server/host/api.py
index bb191a6025..c1d1e7f608 100644
--- a/marimo/_server/host/api.py
+++ b/marimo/_server/host/api.py
@@ -741,7 +741,7 @@ def _stream(
event = await asyncio.wait_for(
subscription.next(), PING_SECONDS
)
- except asyncio.TimeoutError:
+ except TimeoutError:
yield PING
continue
yield _frame(event)
diff --git a/marimo/_server/host/index.py b/marimo/_server/host/index.py
index 33605182ea..3ad6424f02 100644
--- a/marimo/_server/host/index.py
+++ b/marimo/_server/host/index.py
@@ -7,7 +7,7 @@ Notebook IDs persist across rescans and recorded file moves.
from __future__ import annotations
import asyncio
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from pathlib import Path
from typing import TYPE_CHECKING
@@ -287,7 +287,7 @@ class WorkspaceIndex:
),
updated_at=None
if modified is None
- else datetime.fromtimestamp(modified, tz=timezone.utc),
+ else datetime.fromtimestamp(modified, tz=UTC),
)
if notebook_id in self._host.notebooks:
self._host.update_notebook(record, request_id=request_id)
diff --git a/marimo/_server/host/record.py b/marimo/_server/host/record.py
index db0414aa12..e5d5015b5e 100644
--- a/marimo/_server/host/record.py
+++ b/marimo/_server/host/record.py
@@ -6,7 +6,7 @@ from __future__ import annotations
import atexit
import os
import tempfile
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from ipaddress import IPv6Address, ip_address
from uuid import uuid4
@@ -53,10 +53,10 @@ def _process_started_at() -> datetime:
import psutil
started = psutil.Process(os.getpid()).create_time()
- return datetime.fromtimestamp(started, tz=timezone.utc)
+ return datetime.fromtimestamp(started, tz=UTC)
except Exception:
# The fallback allows discovery but cannot verify process identity.
- return datetime.now(timezone.utc)
+ return datetime.now(UTC)
class HostRecordFile:
diff --git a/marimo/_server/host/session.py b/marimo/_server/host/session.py
index 14ac487174..c437424db2 100644
--- a/marimo/_server/host/session.py
+++ b/marimo/_server/host/session.py
@@ -183,7 +183,7 @@ class SessionEventStream(SessionHandler):
event = await asyncio.wait_for(
self._events.get(), self.heartbeat_seconds
)
- except asyncio.TimeoutError:
+ except TimeoutError:
yield None
continue
if event is None:
diff --git a/marimo/_server/scratchpad.py b/marimo/_server/scratchpad.py
index 1b7427d99d..8b91479371 100644
--- a/marimo/_server/scratchpad.py
+++ b/marimo/_server/scratchpad.py
@@ -237,7 +237,7 @@ class ScratchCellListener(EventAwareExtension):
msg = await asyncio.wait_for(
self._queue.get(), timeout=remaining
)
- except asyncio.TimeoutError:
+ except TimeoutError:
self.timed_out = True
return
if msg is None:
diff --git a/marimo/_server/server_registry.py b/marimo/_server/server_registry.py
index c3c42f53ef..78709a235e 100644
--- a/marimo/_server/server_registry.py
+++ b/marimo/_server/server_registry.py
@@ -19,7 +19,7 @@ import json
import os
import tempfile
from dataclasses import asdict, dataclass
-from datetime import datetime, timezone
+from datetime import UTC, datetime
from typing import TYPE_CHECKING
if TYPE_CHECKING:
@@ -76,7 +76,7 @@ class ServerRegistryEntry:
host=host,
port=port,
base_url=base_url,
- started_at=datetime.now(timezone.utc).isoformat(),
+ started_at=datetime.now(UTC).isoformat(),
version=__version__,
)
diff --git a/marimo/_session/managers/ipc.py b/marimo/_session/managers/ipc.py
index 96c87ae9f4..f01db43a9f 100644
--- a/marimo/_session/managers/ipc.py
+++ b/marimo/_session/managers/ipc.py
@@ -586,13 +586,13 @@ class IPCKernelManagerImpl(KernelManager):
return_when=asyncio.FIRST_COMPLETED,
)
if not done:
- raise asyncio.TimeoutError
+ raise TimeoutError
if handshake not in done:
# Let the reader finish lines printed immediately before
# exit, but don't wait on pipes inherited by descendants.
try:
await asyncio.wait_for(asyncio.shield(handshake), 0.5)
- except asyncio.TimeoutError:
+ except TimeoutError:
raise KernelStartupError(
f"Kernel exited during startup (exit code {exited.result()})."
) from None
@@ -628,7 +628,7 @@ class IPCKernelManagerImpl(KernelManager):
# Create a ProcessLike wrapper for the subprocess
self.kernel_task = _SubprocessWrapper(self._process)
- except asyncio.TimeoutError as e:
+ except TimeoutError as e:
raise KernelStartupError(
f"Kernel did not become ready within {_startup_timeout():.0f}s "
f"(override with MARIMO_KERNEL_STARTUP_TIMEOUT).\n\n"
diff --git a/marimo/_utils/assert_never.py b/marimo/_utils/assert_never.py
index ab77a8ec6b..d4562f63fd 100644
--- a/marimo/_utils/assert_never.py
+++ b/marimo/_utils/assert_never.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, NoReturn
+from typing import Any, Never, NoReturn
from marimo import _loggers
@@ -12,9 +12,9 @@ def _form_error_message(value: Any) -> str:
return f"Unhandled value: {value} ({type(value).__name__})"
-def assert_never(value: NoReturn) -> NoReturn:
+def assert_never(value: Never) -> NoReturn:
raise AssertionError(_form_error_message(value))
-def log_never(value: NoReturn) -> None:
+def log_never(value: Never) -> None:
LOGGER.warning(_form_error_message(value))
diff --git a/marimo/_utils/async_path.py b/marimo/_utils/async_path.py
index 2423043784..1cc646b681 100644
--- a/marimo/_utils/async_path.py
+++ b/marimo/_utils/async_path.py
@@ -14,8 +14,7 @@ StrPath = str | os.PathLike[str]
if TYPE_CHECKING:
from collections.abc import AsyncGenerator, Iterator
-
- from typing_extensions import Self
+ from typing import Self
class AsyncPath(PurePath):
diff --git a/marimo/_utils/background_task.py b/marimo/_utils/background_task.py
index 97dff8dd4c..10dbec0de7 100644
--- a/marimo/_utils/background_task.py
+++ b/marimo/_utils/background_task.py
@@ -10,8 +10,7 @@ from marimo import _loggers
if TYPE_CHECKING:
from types import TracebackType
-
- from typing_extensions import Self
+ from typing import Self
LOGGER = _loggers.marimo_logger()
@@ -87,7 +86,7 @@ class AsyncBackgroundTask(ABC):
await asyncio.wait_for(
self._shutdown_event.wait(), timeout=timeout
)
- except asyncio.TimeoutError:
+ except TimeoutError:
self.task.cancel()
try:
await self.task
diff --git a/marimo/_utils/dataclass_to_openapi.py b/marimo/_utils/dataclass_to_openapi.py
index 93cbc4e6dc..a8ae16251b 100644
--- a/marimo/_utils/dataclass_to_openapi.py
+++ b/marimo/_utils/dataclass_to_openapi.py
@@ -3,9 +3,8 @@ from __future__ import annotations
import dataclasses
import datetime
-import sys
import types
-from collections.abc import Mapping, Sequence as CollectionSequence
+from collections.abc import Mapping, Sequence
from decimal import Decimal
from enum import Enum
from typing import (
@@ -13,25 +12,19 @@ from typing import (
ClassVar,
ForwardRef,
Literal,
- Optional,
+ NotRequired,
+ Optional, # noqa: UP035
Union,
get_args,
get_origin,
get_type_hints,
)
-from marimo._utils.case import to_camel_case
-
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
-
-from typing import Sequence # noqa: UP035
-
import msgspec
import msgspec.json
+from marimo._utils.case import to_camel_case
+
_UNION_ORIGINS = (Union, types.UnionType)
@@ -116,11 +109,7 @@ class PythonTypeToOpenAPI:
]
)
}
- elif (
- origin is list
- or origin is CollectionSequence
- or origin is Sequence
- ):
+ elif origin is list or origin is Sequence:
if py_type in processed_classes:
ref = processed_classes[py_type]
return {"$ref": f"#/components/schemas/{ref}"}
diff --git a/marimo/_utils/parse_dataclass.py b/marimo/_utils/parse_dataclass.py
index 2bc580c242..6d55069e19 100644
--- a/marimo/_utils/parse_dataclass.py
+++ b/marimo/_utils/parse_dataclass.py
@@ -4,12 +4,12 @@ from __future__ import annotations
import dataclasses
import datetime
import json
-import sys
import types
from enum import Enum
from typing import (
Any,
Literal,
+ NotRequired,
Optional,
TypeVar,
Union,
@@ -22,11 +22,6 @@ from typing import (
import msgspec
import msgspec.json
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
-
T = TypeVar("T")
_UNION_ORIGINS = (Union, types.UnionType)
diff --git a/marimo/_utils/toml.py b/marimo/_utils/toml.py
index dff582f9f4..d8603b0a02 100644
--- a/marimo/_utils/toml.py
+++ b/marimo/_utils/toml.py
@@ -1,38 +1,25 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-import sys
+import tomllib
from typing import IO, TYPE_CHECKING, Any
if TYPE_CHECKING:
from collections.abc import Callable
from pathlib import Path
-# tomllib is available in python 3.11+ and is much faster than tomlkit
-# (C extension vs pure Python). Prefer it for read-only operations.
-_HAS_TOMLLIB = sys.version_info >= (3, 11)
-
class TomlReader:
- """TOML reader that prefers tomllib (3.11+) over tomlkit."""
+ """Read-only TOML reader backed by the standard library `tomllib`."""
decode_error: type[Exception]
_load: Callable[[IO[bytes]], dict[str, Any]]
_loads: Callable[[str], dict[str, Any]]
def __init__(self) -> None:
- if _HAS_TOMLLIB:
- import tomllib
-
- self._load = tomllib.load # type: ignore[assignment]
- self._loads = tomllib.loads # type: ignore[assignment]
- self.decode_error = tomllib.TOMLDecodeError
- else:
- import tomlkit
-
- self._load = lambda f: tomlkit.load(f).unwrap()
- self._loads = lambda s: tomlkit.loads(s).unwrap()
- self.decode_error = tomlkit.exceptions.TOMLKitError
+ self._load = tomllib.load
+ self._loads = tomllib.loads
+ self.decode_error = tomllib.TOMLDecodeError
def read(self, file_path: str | Path) -> dict[str, Any]:
"""Read and parse a TOML file."""
diff --git a/marimo/_utils/typing.py b/marimo/_utils/typing.py
index 810b068894..8338e78430 100644
--- a/marimo/_utils/typing.py
+++ b/marimo/_utils/typing.py
@@ -2,18 +2,12 @@
from __future__ import annotations
import sys
+from typing import NotRequired as _NotRequired
if sys.version_info >= (3, 12):
- from typing import NotRequired as _NotRequired, override as _override
-elif sys.version_info >= (3, 11):
- from typing import NotRequired as _NotRequired
-
- from typing_extensions import override as _override
+ from typing import override as _override
else:
- from typing_extensions import (
- NotRequired as _NotRequired,
- override as _override,
- )
+ from typing_extensions import override as _override
NotRequired = _NotRequired
override = _override
diff --git a/marimo/_utils/with_skip.py b/marimo/_utils/with_skip.py
index 3fa7f8f4d1..2a9a58e37a 100644
--- a/marimo/_utils/with_skip.py
+++ b/marimo/_utils/with_skip.py
@@ -8,9 +8,9 @@ from typing import TYPE_CHECKING, Any, NoReturn
if TYPE_CHECKING:
from types import FrameType
+ from typing import Self
from _typeshed import TraceFunction
- from typing_extensions import Self
class SkipContext(ABC):
diff --git a/protocols/host/conformance/conftest.py b/protocols/host/conformance/conftest.py
index a8ad61ff41..25ef1a02de 100644
--- a/protocols/host/conformance/conftest.py
+++ b/protocols/host/conformance/conftest.py
@@ -66,9 +66,7 @@ def record(pytestconfig: pytest.Config) -> dict[str, Any]:
assert not url.query
assert not url.fragment
process = psutil.Process(value["process"]["pid"])
- started = datetime.fromisoformat(
- value["process"]["started_at"].replace("Z", "+00:00")
- )
+ started = datetime.fromisoformat(value["process"]["started_at"])
assert abs(process.create_time() - started.timestamp()) < 1, (
"stale process identity"
)
diff --git a/pyproject.toml b/pyproject.toml
index 6d0a091eea..dd0a0e2143 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,7 @@ dependencies = [
# loro for collaborative editing (native extension; server-only).
# No cp315 wheels as of 2026-10; drop the python_version marker when published.
"loro>=1.10.0; python_version < '3.15' and sys_platform != 'emscripten' and sys_platform != 'android'",
- # python <=3.10 compatibility
+ # python <=3.11 compatibility
"typing_extensions>=4.4.0; python_version < '3.12'",
# for rst parsing; lowerbound determined by awscli requiring < 0.17,
"docutils>=0.16.0",
@@ -61,7 +61,7 @@ dependencies = [
readme = "README.md"
license = "Apache-2.0"
license-files = ["LICENSE"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
classifiers = [
"Operating System :: OS Independent",
"Environment :: Console",
@@ -70,7 +70,6 @@ classifiers = [
"Intended Audience :: Science/Research",
"Intended Audience :: Education",
"Programming Language :: Python",
- "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
@@ -323,9 +322,9 @@ docs = [
# For packages without eligible source distributions, require wheels
# for these targets so resolution can backtrack past incomplete uploads.
required-environments = [
- "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version >= '3.10' and python_version < '3.16'",
- "sys_platform == 'darwin' and platform_machine == 'arm64' and python_version == '3.10'",
- "sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.10'",
+ "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version >= '3.11' and python_version < '3.16'",
+ "sys_platform == 'darwin' and platform_machine == 'arm64' and python_version == '3.11'",
+ "sys_platform == 'win32' and platform_machine == 'AMD64' and python_version == '3.11'",
]
# Mirror CI's dependency window (UV_EXCLUDE_NEWER in .github/workflows) so local
# resolution reproduces what CI resolves at setup time, including the ruff version.
@@ -381,6 +380,9 @@ ignore = [
"D415", # First line should end with a period, question mark, or exclamation point
"PLR1711", # Useless returns. We use this currently to delimit the end of a cell.
"ASYNC119", # Yield in context manager in async generator; required for streaming generators (LLM/SSE), no clean refactor
+ # Enabled by the Python 3.11 target. Both need deliberate migrations.
+ "ASYNC109", # Async function with a `timeout` parameter; callers should use `asyncio.timeout`
+ "UP042", # `class X(str, Enum)` to `StrEnum`; changes `str()` of members
# From new version of Ruff: We should fix these, but it raises too many errors
"BLE001", # Do not catch blind exception: `Exception`
diff --git a/tests/_ast/test_visitor.py b/tests/_ast/test_visitor.py
index 7165bbad7c..b6964a9314 100644
--- a/tests/_ast/test_visitor.py
+++ b/tests/_ast/test_visitor.py
@@ -1120,7 +1120,6 @@ def test_try_block() -> None:
assert v.defs == {"f", "v", "w", "x", "y", "z", "err", "err2", "err3"}
[email protected]("sys.version_info < (3, 11)")
def test_try_star_block() -> None:
code = "try:\n raise ExceptionGroup('eg', [ValueError(1), TypeError(2), OSError(3)])\nexcept* TypeError as e:\n print(f'caught {type(e)} with nested {e.exceptions}')\nexcept* OSError as f:\n print(f'caught {type(f)} with nested {f.exceptions}')\nelse:\n print('Type and Os not raised')\nfinally:\n print('finally')"
v = visitor.ScopedVisitor()
diff --git a/tests/_cli/test_pair_client.py b/tests/_cli/test_pair_client.py
index f663297c1e..c30e24027b 100644
--- a/tests/_cli/test_pair_client.py
+++ b/tests/_cli/test_pair_client.py
@@ -7,6 +7,7 @@ import json
import os
import queue
import threading
+from datetime import UTC
from pathlib import Path
from typing import TYPE_CHECKING, Any
from unittest.mock import Mock
@@ -820,7 +821,7 @@ def test_resolve_session_many_matches(
def _host_record(
path: Path, *, url: str, started: float | None = None
) -> None:
- from datetime import datetime, timezone
+ from datetime import datetime
import msgspec
import psutil
@@ -837,7 +838,7 @@ def _host_record(
psutil.Process().create_time()
if started is None
else started,
- tz=timezone.utc,
+ tz=UTC,
),
),
name="marimo",
diff --git a/tests/_config/test_config_schema.py b/tests/_config/test_config_schema.py
index a9a9bfc106..0657dc2b38 100644
--- a/tests/_config/test_config_schema.py
+++ b/tests/_config/test_config_schema.py
@@ -1,11 +1,11 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-import sys
import types
from typing import (
TYPE_CHECKING,
Any,
+ NotRequired,
Union,
get_args,
get_origin,
@@ -32,12 +32,6 @@ from marimo._config.schema_utils import (
if TYPE_CHECKING:
from pathlib import Path
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
-
-
SCHEMA_CLASSES = [
cls
for cls in vars(config_schema).values()
diff --git a/tests/_data/_external_storage/test_storage_models.py b/tests/_data/_external_storage/test_storage_models.py
index e2ac67b462..3bf7015fa8 100644
--- a/tests/_data/_external_storage/test_storage_models.py
+++ b/tests/_data/_external_storage/test_storage_models.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import tempfile
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
from typing import Any
from unittest.mock import AsyncMock, MagicMock, patch
@@ -38,7 +38,7 @@ class TestObstore:
return Obstore(store, VariableName(name))
def test_list_entries(self) -> None:
- now = datetime.now(tz=timezone.utc)
+ now = datetime.now(tz=UTC)
mock_store = MagicMock()
mock_store.list_with_delimiter.return_value = {
"common_prefixes": ["subdir/"],
@@ -96,7 +96,7 @@ class TestObstore:
)
def test_list_entries_skips_zero_byte_folder_marker(self) -> None:
- now = datetime.now(tz=timezone.utc)
+ now = datetime.now(tz=UTC)
mock_store = MagicMock()
mock_store.list_with_delimiter.return_value = {
"common_prefixes": [],
@@ -144,7 +144,7 @@ class TestObstore:
assert result.entries == []
def test_list_entries_returns_next_page_token(self) -> None:
- now = datetime.now(tz=timezone.utc)
+ now = datetime.now(tz=UTC)
mock_store = MagicMock()
mock_store.list_with_delimiter.return_value = {
"common_prefixes": ["a/", "b/"],
@@ -228,7 +228,7 @@ class TestObstore:
)
def test_create_storage_entry_with_all_metadata(self) -> None:
- now = datetime(2025, 6, 15, 12, 0, 0, tzinfo=timezone.utc)
+ now = datetime(2025, 6, 15, 12, 0, 0, tzinfo=UTC)
mock_store = MagicMock()
backend = self._make_backend(mock_store)
@@ -268,7 +268,7 @@ class TestObstore:
assert entry.mime_type == "application/toml"
async def test_get_entry(self) -> None:
- now = datetime(2025, 6, 15, 12, 0, 0, tzinfo=timezone.utc)
+ now = datetime(2025, 6, 15, 12, 0, 0, tzinfo=UTC)
mock_store = MagicMock()
head_result = {
"path": "test.txt",
@@ -1141,7 +1141,7 @@ class TestFsspecFilesystem:
@pytest.mark.parametrize(
"mtime",
[
- datetime(2024, 1, 1, tzinfo=timezone.utc),
+ datetime(2024, 1, 1, tzinfo=UTC),
datetime(2024, 1, 1), # naive datetimes are treated as UTC
],
)
diff --git a/tests/_export/test_export_ipynb.py b/tests/_export/test_export_ipynb.py
index 4eca50889d..fcc8443511 100644
--- a/tests/_export/test_export_ipynb.py
+++ b/tests/_export/test_export_ipynb.py
@@ -3,7 +3,6 @@
from __future__ import annotations
import pathlib
-import sys
from pathlib import Path
import pytest
@@ -87,9 +86,6 @@ HEAVY_DEPENDENCY_APPS = {"with_outputs"}
ids=lambda path: path.stem,
)
@pytest.mark.skipif(not HAS_DEPS, reason="optional dependencies not installed")
- sys.version_info < (3, 11), reason="3.10 has different stack trace format"
-)
async def test_export_ipynb(app_path: Path) -> None:
"""Test ipynb export with actual execution outputs."""
internal_app = _load_fixture_app(app_path)
diff --git a/tests/_lint/test_wasm_rules.py b/tests/_lint/test_wasm_rules.py
index bd140e5dac..82c8c4fe81 100644
--- a/tests/_lint/test_wasm_rules.py
+++ b/tests/_lint/test_wasm_rules.py
@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING
from unittest.mock import patch
if TYPE_CHECKING:
- from typing_extensions import Self
+ from typing import Self
from marimo._ast.parse import parse_notebook
from marimo._lint.diagnostic import Severity
diff --git a/tests/_plugins/core/test_json_encoder.py b/tests/_plugins/core/test_json_encoder.py
index 0aa7747d17..6d14b9990c 100644
--- a/tests/_plugins/core/test_json_encoder.py
+++ b/tests/_plugins/core/test_json_encoder.py
@@ -6,7 +6,6 @@ import datetime
import fractions
import json
import pathlib
-import sys
import uuid
from collections import namedtuple
from dataclasses import dataclass
@@ -461,9 +460,6 @@ def test_enum_via_sanitize_json_bigint() -> None:
assert "__objclass__" not in encoded
- sys.version_info < (3, 11), reason="StrEnum not supported in Python 3.10"
-)
def test_str_enum() -> None:
from enum import StrEnum
diff --git a/tests/_plugins/ui/_impl/tables/test_ibis_table.py b/tests/_plugins/ui/_impl/tables/test_ibis_table.py
index c8232a8e09..6699e5fe72 100644
--- a/tests/_plugins/ui/_impl/tables/test_ibis_table.py
+++ b/tests/_plugins/ui/_impl/tables/test_ibis_table.py
@@ -489,21 +489,11 @@ class TestTemporalColSummaries(unittest.TestCase):
datetime.datetime(2021, 1, 5),
],
"datetime_with_tz": [
- datetime.datetime(
- 2021, 1, 1, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 2, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 3, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 4, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 5, tzinfo=datetime.timezone.utc
- ),
+ datetime.datetime(2021, 1, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 2, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 3, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 4, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 5, tzinfo=datetime.UTC),
],
"time": [
datetime.time(1, 2, 3),
@@ -565,28 +555,28 @@ class TestTemporalColSummaries(unittest.TestCase):
assert bin_values == [
BinValue(
bin_start=datetime.datetime(
- 2021, 1, 1, 8, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 1, 8, 0, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 1, 2, 16, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 2, 16, 0, 0, tzinfo=datetime.UTC
),
count=2,
),
BinValue(
bin_start=datetime.datetime(
- 2021, 1, 2, 16, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 2, 16, 0, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 1, 4, 0, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 4, 0, 0, 0, tzinfo=datetime.UTC
),
count=1,
),
BinValue(
bin_start=datetime.datetime(
- 2021, 1, 4, 0, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 4, 0, 0, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 1, 5, 8, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 5, 8, 0, 0, tzinfo=datetime.UTC
),
count=2,
),
diff --git a/tests/_plugins/ui/_impl/tables/test_narwhals.py b/tests/_plugins/ui/_impl/tables/test_narwhals.py
index 764b8da93a..0ca85ac783 100644
--- a/tests/_plugins/ui/_impl/tables/test_narwhals.py
+++ b/tests/_plugins/ui/_impl/tables/test_narwhals.py
@@ -1248,11 +1248,11 @@ def test_get_bin_values_decimal(df: Any) -> None:
datetime.timedelta(days=5, hours=5, minutes=5, seconds=5),
],
"datetime_with_tz": [
- datetime.datetime(2021, 1, 1, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 2, 1, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 3, 1, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 4, 1, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 5, 1, tzinfo=datetime.timezone.utc),
+ datetime.datetime(2021, 1, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 2, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 3, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 4, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 5, 1, tzinfo=datetime.UTC),
],
"dates_multiple": [
datetime.date(2021, 1, 1),
@@ -1347,28 +1347,28 @@ class TestGetBinValuesTemporal:
assert bin_values == [
BinValue(
bin_start=datetime.datetime(
- 2021, 1, 1, 0, 0, tzinfo=datetime.timezone.utc
+ 2021, 1, 1, 0, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 2, 10, 8, 0, tzinfo=datetime.timezone.utc
+ 2021, 2, 10, 8, 0, tzinfo=datetime.UTC
),
count=2,
),
BinValue(
bin_start=datetime.datetime(
- 2021, 2, 10, 8, 0, tzinfo=datetime.timezone.utc
+ 2021, 2, 10, 8, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 3, 22, 8, 0, tzinfo=datetime.timezone.utc
+ 2021, 3, 22, 8, 0, tzinfo=datetime.UTC
),
count=1,
),
BinValue(
bin_start=datetime.datetime(
- 2021, 3, 22, 8, 0, tzinfo=datetime.timezone.utc
+ 2021, 3, 22, 8, 0, tzinfo=datetime.UTC
),
bin_end=datetime.datetime(
- 2021, 5, 1, 8, 0, tzinfo=datetime.timezone.utc
+ 2021, 5, 1, 8, 0, tzinfo=datetime.UTC
),
count=2,
),
@@ -1513,10 +1513,10 @@ def test_sort_values_with_nulls(df: Any) -> None:
"A": [1, 2, 3, 4], # Integer
"B": ["a", "b", "c", "d"], # String
"C": [
- datetime.datetime(2021, 1, 1, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 1, 2, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 1, 3, tzinfo=datetime.timezone.utc),
- datetime.datetime(2021, 1, 4, tzinfo=datetime.timezone.utc),
+ datetime.datetime(2021, 1, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 2, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 3, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 4, tzinfo=datetime.UTC),
], # Datetime with timezone
"D": [1.1, 2.2, 3.3, 4.4], # Float
"E": [True, False, True, False], # Boolean
diff --git a/tests/_plugins/ui/_impl/tables/test_pandas_table.py b/tests/_plugins/ui/_impl/tables/test_pandas_table.py
index 19d98a2a2d..e16b5edd16 100644
--- a/tests/_plugins/ui/_impl/tables/test_pandas_table.py
+++ b/tests/_plugins/ui/_impl/tables/test_pandas_table.py
@@ -1980,15 +1980,9 @@ class TestPandasTableManager(unittest.TestCase):
datetime.time(7, 8, 9),
],
"datetime_tz_col": [
- datetime.datetime(
- 2021, 1, 1, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 2, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2021, 1, 3, tzinfo=datetime.timezone.utc
- ),
+ datetime.datetime(2021, 1, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 2, tzinfo=datetime.UTC),
+ datetime.datetime(2021, 1, 3, tzinfo=datetime.UTC),
],
}
)
diff --git a/tests/_plugins/ui/_impl/test_altair_chart.py b/tests/_plugins/ui/_impl/test_altair_chart.py
index 75f8ade5c5..877dde3f28 100644
--- a/tests/_plugins/ui/_impl/test_altair_chart.py
+++ b/tests/_plugins/ui/_impl/test_altair_chart.py
@@ -215,18 +215,10 @@ class TestAltairChart:
datetime.date(2020, 1, 10),
],
"date_column_utc": [
- datetime.datetime(
- 2019, 12, 29, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2020, 1, 1, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2020, 1, 8, tzinfo=datetime.timezone.utc
- ),
- datetime.datetime(
- 2020, 1, 10, tzinfo=datetime.timezone.utc
- ),
+ datetime.datetime(2019, 12, 29, tzinfo=datetime.UTC),
+ datetime.datetime(2020, 1, 1, tzinfo=datetime.UTC),
+ datetime.datetime(2020, 1, 8, tzinfo=datetime.UTC),
+ datetime.datetime(2020, 1, 10, tzinfo=datetime.UTC),
],
"datetime_column": [
datetime.datetime(2019, 12, 29),
@@ -282,11 +274,11 @@ class TestAltairChart:
"signal_channel_2": {
"date_column_utc": [
datetime.datetime(
- 2019, 12, 29, tzinfo=datetime.timezone.utc
+ 2019, 12, 29, tzinfo=datetime.UTC
).timestamp()
* 1000,
datetime.datetime(
- 2020, 1, 1, tzinfo=datetime.timezone.utc
+ 2020, 1, 1, tzinfo=datetime.UTC
).timestamp()
* 1000,
]
@@ -365,12 +357,8 @@ class TestAltairChart:
create_dataframes(
{
"datetime_column_utc": [
- datetime.datetime.fromtimestamp(
- 10000, datetime.timezone.utc
- ),
- datetime.datetime.fromtimestamp(
- 20000, datetime.timezone.utc
- ),
+ datetime.datetime.fromtimestamp(10000, datetime.UTC),
+ datetime.datetime.fromtimestamp(20000, datetime.UTC),
],
"datetime_column": [
datetime.datetime(2019, 12, 29),
@@ -396,7 +384,7 @@ class TestAltairChart:
2,
46,
40,
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
).isoformat()
],
"vlPoint": [1],
@@ -420,7 +408,7 @@ class TestAltairChart:
1,
46,
40,
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
).isoformat(),
datetime.datetime(
1970,
@@ -429,7 +417,7 @@ class TestAltairChart:
1,
46,
40,
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
).isoformat(),
]
}
@@ -452,7 +440,7 @@ class TestAltairChart:
1,
0,
40,
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
).isoformat(),
datetime.datetime(
1970,
@@ -461,7 +449,7 @@ class TestAltairChart:
1,
1,
40,
- tzinfo=datetime.timezone.utc,
+ tzinfo=datetime.UTC,
).isoformat(),
]
}
@@ -498,10 +486,10 @@ class TestAltairChart:
"select_interval": {
"datetime_column": [
datetime.datetime(
- 2019, 12, 29, tzinfo=datetime.timezone.utc
+ 2019, 12, 29, tzinfo=datetime.UTC
).isoformat(),
datetime.datetime(
- 2020, 1, 1, tzinfo=datetime.timezone.utc
+ 2020, 1, 1, tzinfo=datetime.UTC
).isoformat(),
]
}
@@ -520,12 +508,8 @@ class TestAltairChart:
create_dataframes(
{
"datetime_column_utc": [
- datetime.datetime.fromtimestamp(
- 10000, datetime.timezone.utc
- ),
- datetime.datetime.fromtimestamp(
- 20000, datetime.timezone.utc
- ),
+ datetime.datetime.fromtimestamp(10000, datetime.UTC),
+ datetime.datetime.fromtimestamp(20000, datetime.UTC),
],
"datetime_column": [
datetime.datetime.fromtimestamp(10000),
@@ -621,10 +605,10 @@ class TestAltairChart:
"select_interval": {
"datetime_column": [
datetime.datetime(
- 2019, 12, 29, tzinfo=datetime.timezone.utc
+ 2019, 12, 29, tzinfo=datetime.UTC
).isoformat(),
datetime.datetime(
- 2020, 1, 1, tzinfo=datetime.timezone.utc
+ 2020, 1, 1, tzinfo=datetime.UTC
).isoformat(),
]
}
diff --git a/tests/_plugins/ui/_impl/test_plotly.py b/tests/_plugins/ui/_impl/test_plotly.py
index 86b41817d2..80d477bbe2 100644
--- a/tests/_plugins/ui/_impl/test_plotly.py
+++ b/tests/_plugins/ui/_impl/test_plotly.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import os
import time
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
from typing import Any
import pytest
@@ -943,7 +943,7 @@ def test_to_numeric_coord_normalizes_naive_datetimes_to_utc() -> None:
naive_dt = datetime(2024, 1, 2, 3, 4, 5)
utc_string = "2024-01-02T03:04:05Z"
- aware_dt = datetime(2024, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
+ aware_dt = datetime(2024, 1, 2, 3, 4, 5, tzinfo=UTC)
assert _to_numeric_coord(naive_dt) == _to_numeric_coord(utc_string)
assert _to_numeric_coord(naive_dt) == _to_numeric_coord(aware_dt)
diff --git a/tests/_runtime/test_trace.py b/tests/_runtime/test_trace.py
index 995175f335..6e6639e9f7 100644
--- a/tests/_runtime/test_trace.py
+++ b/tests/_runtime/test_trace.py
@@ -45,13 +45,11 @@ class TestScriptTrace:
# Expected output:
# y = y / x
# ~~^~~
- # exact line numbers differ by python version
- if sys.version_info >= (3, 11):
- assert (
- result.split("y / x")[1]
- .split("\n")[1]
- .startswith(" ~~^~~")
- )
+ assert (
+ result.split("y / x")[1]
+ .split("\n")[1]
+ .startswith(" ~~^~~")
+ )
@staticmethod
def test_script_trace() -> None:
@@ -191,8 +189,7 @@ class TestAppTrace:
post_file = result.split("marimo__cell")[1].split("\n")
assert "line 4" in post_file[0]
assert post_file[1].startswith(" y = y / x #L4")
- if sys.version_info >= (3, 11):
- assert post_file[2].startswith(" ~~^~~")
+ assert post_file[2].startswith(" ~~^~~")
@staticmethod
async def test_app_trace_output_line_number(
@@ -240,8 +237,7 @@ class TestAppTrace:
assert "foo()" in post_file_call[1]
post_file_error = result.split("marimo__cell_0")[1].split("\n")
assert post_file_error[1].startswith(" y = y / x #L5")
- if sys.version_info >= (3, 11):
- assert post_file_error[2].startswith(" ~~^~~")
+ assert post_file_error[2].startswith(" ~~^~~")
@staticmethod
async def test_app_trace_name_error_reference_caught(
diff --git a/tests/_server/api/endpoints/test_sse.py b/tests/_server/api/endpoints/test_sse.py
index e0c0819293..96e83f922c 100644
--- a/tests/_server/api/endpoints/test_sse.py
+++ b/tests/_server/api/endpoints/test_sse.py
@@ -40,10 +40,10 @@ from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
from pathlib import Path
+ from typing import Self
from starlette.applications import Starlette
from starlette.testclient import TestClient
- from typing_extensions import Self
SSE_QUERY = "session_id=123&access_token=fake-token"
OTHER_SSE_QUERY = "session_id=456&access_token=fake-token"
diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.py
index 9cddf229c2..96c6cddaf0 100644
--- a/tests/_server/api/endpoints/test_ws.py
+++ b/tests/_server/api/endpoints/test_ws.py
@@ -955,7 +955,7 @@ def test_sandbox_progress_before_preparation_failure(
async def prepare(*_args: object, **_kwargs: object) -> None:
try:
await asyncio.wait_for(release.wait(), timeout=5)
- except asyncio.TimeoutError:
+ except TimeoutError:
pass
raise EnvironmentManagerError("Could not resolve dependencies")
diff --git a/tests/_server/api/endpoints/test_ws_rtc.py b/tests/_server/api/endpoints/test_ws_rtc.py
index 0a52fdcaf7..c6558fc474 100644
--- a/tests/_server/api/endpoints/test_ws_rtc.py
+++ b/tests/_server/api/endpoints/test_ws_rtc.py
@@ -57,9 +57,7 @@ ws_1_sync = "/ws_sync?session_id=123&access_token=fake-token"
ws_2_sync = "/ws_sync?session_id=456&access_token=fake-token"
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_loro_sync(client: TestClient) -> None:
"""Test that Loro-CRDT sync works between multiple clients"""
@@ -93,9 +91,7 @@ async def test_loro_sync(client: TestClient) -> None:
assert len(sync_msg2) > 0
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_loro_cleanup_on_session_close(
client: TestClient,
) -> None:
@@ -138,9 +134,7 @@ async def test_loro_cleanup_on_session_close(
assert len(DOC_MANAGER.loro_docs_clients[file_key]) == 0
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_loro_persistence(client: TestClient) -> None:
"""Test that cell content persists between connections"""
from loro import ExportMode, LoroDoc
@@ -190,9 +184,7 @@ async def test_loro_persistence(client: TestClient) -> None:
# ==============================================================================
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_rtc_degrades_without_loro(client: TestClient) -> None:
"""Test that RTC gracefully degrades when Loro is unavailable.
@@ -233,9 +225,7 @@ async def test_rtc_degrades_without_loro(client: TestClient) -> None:
# ==============================================================================
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_ws_sync_without_existing_session(client: TestClient) -> None:
"""Test that ws_sync endpoint requires an existing session."""
file_key = get_session_manager(client).workspace.get_unique_file_key()
@@ -254,9 +244,7 @@ async def test_ws_sync_without_existing_session(client: TestClient) -> None:
assert exc_info.value.reason == "MARIMO_NOT_ALLOWED"
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_ws_sync_cleanup_on_main_disconnect(client: TestClient) -> None:
"""Test that ws_sync clients are cleaned up when main session disconnects."""
file_key = get_session_manager(client).workspace.get_unique_file_key()
diff --git a/tests/_server/host/drive.py b/tests/_server/host/drive.py
index 1bc4c02624..13c45142f8 100644
--- a/tests/_server/host/drive.py
+++ b/tests/_server/host/drive.py
@@ -200,7 +200,7 @@ async def wait_for(
response.changed.clear()
try:
await asyncio.wait_for(response.changed.wait(), remaining)
- except asyncio.TimeoutError:
+ except TimeoutError:
continue
diff --git a/tests/_server/rtc/test_rtc_doc.py b/tests/_server/rtc/test_rtc_doc.py
index f0920a881b..2fb4c3ee18 100644
--- a/tests/_server/rtc/test_rtc_doc.py
+++ b/tests/_server/rtc/test_rtc_doc.py
@@ -10,7 +10,7 @@ from marimo._server.rtc.doc import LoroDocManager
from marimo._server.workspace import MarimoFileKey
from marimo._types.ids import CellId_t
-if sys.version_info >= (3, 11) and sys.version_info < (3, 14):
+if sys.version_info < (3, 14):
from loro import LoroDoc, LoroText
doc_manager = LoroDocManager()
@@ -34,9 +34,7 @@ async def setup_doc_manager() -> AsyncGenerator[None, None]:
doc_manager.loro_docs_cleaners.clear()
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_quick_reconnection(setup_doc_manager: None) -> None:
"""Test that quick reconnection properly handles cleanup task cancellation"""
del setup_doc_manager
@@ -72,9 +70,7 @@ async def test_quick_reconnection(setup_doc_manager: None) -> None:
) # Original client + reconnected client
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_two_users_sync(setup_doc_manager: None) -> None:
"""Test that two users can connect and sync text properly without duplicates"""
del setup_doc_manager
@@ -120,9 +116,7 @@ async def test_two_users_sync(setup_doc_manager: None) -> None:
assert lang_text_typed.to_string() == "python"
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_concurrent_doc_creation(setup_doc_manager: None) -> None:
"""Test concurrent doc creation doesn't cause issues"""
del setup_doc_manager
@@ -141,9 +135,7 @@ async def test_concurrent_doc_creation(setup_doc_manager: None) -> None:
assert len(doc_manager.loro_docs) == 1
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_concurrent_client_operations(
setup_doc_manager: None,
) -> None:
@@ -170,9 +162,7 @@ async def test_concurrent_client_operations(
assert len(doc_manager.loro_docs_clients[file_key]) == 0
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_cleanup_task_management(setup_doc_manager: None) -> None:
"""Test cleanup task management and cancellation"""
del setup_doc_manager
@@ -204,9 +194,7 @@ async def test_cleanup_task_management(setup_doc_manager: None) -> None:
await doc_manager.remove_client(file_key, new_queue)
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_broadcast_update(setup_doc_manager: None) -> None:
"""Test broadcast update functionality"""
del setup_doc_manager
@@ -232,9 +220,7 @@ async def test_broadcast_update(setup_doc_manager: None) -> None:
assert await queue.get() == message
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_remove_nonexistent_doc(setup_doc_manager: None) -> None:
"""Test removing a doc that doesn't exist"""
del setup_doc_manager
@@ -245,9 +231,7 @@ async def test_remove_nonexistent_doc(setup_doc_manager: None) -> None:
assert file_key not in doc_manager.loro_docs_cleaners
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_remove_nonexistent_client(setup_doc_manager: None) -> None:
"""Test removing a client that doesn't exist"""
del setup_doc_manager
@@ -257,9 +241,7 @@ async def test_remove_nonexistent_client(setup_doc_manager: None) -> None:
assert file_key not in doc_manager.loro_docs_clients
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_concurrent_doc_removal(setup_doc_manager: None) -> None:
"""Test concurrent doc removal doesn't cause issues"""
del setup_doc_manager
@@ -277,9 +259,7 @@ async def test_concurrent_doc_removal(setup_doc_manager: None) -> None:
assert file_key not in doc_manager.loro_docs_cleaners
- "sys.version_info < (3, 11) or sys.version_info >= (3, 14)"
-)
[email protected]("sys.version_info >= (3, 14)")
async def test_prevent_lock_deadlock(setup_doc_manager: None) -> None:
"""Test that our deadlock prevention measures work correctly.
diff --git a/tests/_server/test_scratchpad.py b/tests/_server/test_scratchpad.py
index 36bf681b0a..2df3ad4087 100644
--- a/tests/_server/test_scratchpad.py
+++ b/tests/_server/test_scratchpad.py
@@ -634,7 +634,7 @@ class TestScratchCellListener:
try:
await asyncio.wait_for(got_event.wait(), timeout=0.1)
raise AssertionError("listener exited on wrong run_id")
- except asyncio.TimeoutError:
+ except TimeoutError:
pass
finally:
task.cancel()
diff --git a/tests/_smoke_tests/run_all.py b/tests/_smoke_tests/run_all.py
index 4ad517ff30..89b99f0d80 100644
--- a/tests/_smoke_tests/run_all.py
+++ b/tests/_smoke_tests/run_all.py
@@ -135,7 +135,7 @@ class Cmd:
),
timeout=self.timeout,
)
- except asyncio.TimeoutError:
+ except TimeoutError:
process.kill()
await process.communicate()
pytest.fail(f"Timeout: {self.command}")
diff --git a/tests/_utils/test_dataclass_to_openapi.py b/tests/_utils/test_dataclass_to_openapi.py
index 9069a5e66f..5557f2c0e3 100644
--- a/tests/_utils/test_dataclass_to_openapi.py
+++ b/tests/_utils/test_dataclass_to_openapi.py
@@ -1,11 +1,8 @@
from __future__ import annotations
import dataclasses
-import sys
import types
-from typing import Any, ClassVar, Literal, TypedDict
-
-import pytest
+from typing import Any, ClassVar, Literal, NotRequired, TypedDict
from marimo._utils.dataclass_to_openapi import (
PythonTypeToOpenAPI,
@@ -212,13 +209,6 @@ def test_is_optional_with_pipe_union() -> None:
assert _is_optional(str | int) is False
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-
-
- sys.version_info < (3, 11), reason="Not supported in Python < 3.11"
-)
def test_not_required() -> None:
class NotRequiredDict(TypedDict):
not_required_item: NotRequired[str]
@@ -237,9 +227,6 @@ def test_not_required() -> None:
}
- sys.version_info < (3, 11), reason="Not supported in Python < 3.11"
-)
def test_not_required_total_false() -> None:
class NotRequiredDictTotalFalse(TypedDict, total=False):
not_required_item: NotRequired[str]
@@ -257,9 +244,6 @@ def test_not_required_total_false() -> None:
}
- sys.version_info < (3, 11), reason="Not supported in Python < 3.11"
-)
def test_not_required_as_dataclass() -> None:
@dataclasses.dataclass
class NotRequiredDictAsDataclass(TypedDict):
@@ -282,9 +266,6 @@ def test_not_required_as_dataclass() -> None:
}
- sys.version_info < (3, 11), reason="Not supported in Python < 3.11"
-)
def test_not_required_as_dataclass_total_false() -> None:
@dataclasses.dataclass
class NotRequiredDictAsDataclassTotalFalse(TypedDict, total=False):
diff --git a/tests/_utils/test_parse_dataclass.py b/tests/_utils/test_parse_dataclass.py
index 3a8f50ab80..51fb4e8682 100644
--- a/tests/_utils/test_parse_dataclass.py
+++ b/tests/_utils/test_parse_dataclass.py
@@ -3,10 +3,15 @@ from __future__ import annotations
import datetime as dt
import json
-import sys
from dataclasses import dataclass, field
from enum import Enum
-from typing import Any, Generic, Literal, NewType, TypedDict, TypeVar
+from typing import (
+ Any,
+ Generic,
+ Literal,
+ NewType,
+ TypeVar,
+)
import msgspec
import pytest
@@ -17,11 +22,6 @@ from marimo._runtime.commands import UpdateCellConfigCommand
from marimo._types.ids import CellId_t
from marimo._utils.parse_dataclass import parse_raw
-if sys.version_info >= (3, 11):
- from typing import NotRequired
-else:
- from typing_extensions import NotRequired
-
@dataclass
class Config:
@@ -757,54 +757,6 @@ def test_recursive_structure_limit() -> None:
assert count == 100
- sys.version_info >= (3, 11), reason="Not supported in Python >= 3.11"
-)
-def test_not_required_types() -> None:
- class WithNotRequired(TypedDict):
- required: str
- optional: NotRequired[str]
- optional_dict: NotRequired[dict[str, str]]
- optional_list: NotRequired[list[str]]
-
- # Test with all fields provided
- data: dict[str, Any] = {
- "required": "value",
- "optional": "optional_value",
- "optional_dict": {"key": "value"},
- "optional_list": ["item"],
- }
- parsed = parse_raw(data, WithNotRequired)
- assert parsed["required"] == "value"
- assert parsed["optional"] == "optional_value"
- assert parsed["optional_dict"] == {"key": "value"}
- assert parsed["optional_list"] == ["item"]
-
- # Test with only required fields
- data = {"required": "value"}
- parsed = parse_raw(data, WithNotRequired)
- assert parsed["required"] == "value"
- assert not hasattr(parsed, "optional") or parsed["optional"] is None
- assert (
- not hasattr(parsed, "optional_dict") or parsed["optional_dict"] is None
- )
- assert (
- not hasattr(parsed, "optional_list") or parsed["optional_list"] is None
- )
-
- # Test with empty values for container types
- data = {
- "required": "value",
- "optional_dict": {},
- "optional_list": [],
- }
- parsed = parse_raw(data, WithNotRequired)
- assert parsed["required"] == "value"
- assert "optional" not in parsed
- assert parsed["optional_dict"] == {}
- assert parsed["optional_list"] == []
-
-
def test_date_and_datetime_types() -> None:
@dataclass
class DateTimeTypes:
diff --git a/tests/conftest.py b/tests/conftest.py
index 6deb957e14..656fb30b17 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -40,8 +40,7 @@ if TYPE_CHECKING:
import threading
from collections.abc import Callable, Generator
from types import ModuleType, TracebackType
-
- from typing_extensions import Self
+ from typing import Self
from marimo._runtime.runtime import Kernel