build: relax runtime typing extensions dependency (#49)

* build: unpin typing_extensions

* build: relax typing extensions deps

Author: tlambert03

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ default_install_hook_types: [pre-commit, commit-msg]
 
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v1.3.0
+    rev: v1.4.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
@@ -31,7 +31,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.37.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus, --keep-runtime-typing]
@@ -52,7 +52,7 @@ repos:
           - flake8-typing-imports
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.961
+    rev: v0.971
     hooks:
       - id: mypy
         files: "^src/"

pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
 ]
 dynamic = ["version"]
-dependencies = ['psygnal', 'pydantic', 'in-n-out', 'typing_extensions>=4.0']
+dependencies = ['psygnal', 'pydantic', 'in-n-out', 'typing_extensions']
 
 # extras
 # https://peps.python.org/pep-0621/#dependencies-optional-dependencies
@@ -54,6 +54,7 @@ docs = [
     "mkdocstrings-python==0.7.0",
     "mkdocstrings==0.19.0",
     "mkdocs-macros-plugin==0.7.0",
+    "typing_extensions>=4.0",
 ]
 [project.urls]
 homepage = "https://github.com/napari/app-model"
@@ -118,10 +119,7 @@ ignore = "D100,D213,D401,D413,D107"
 # https://docs.pytest.org/en/6.2.x/customize.html
 [tool.pytest.ini_options]
 minversion = "6.0"
-filterwarnings = [
-    "error",
-    "ignore:QPixmapCache.find:DeprecationWarning:",
-]
+filterwarnings = ["error", "ignore:QPixmapCache.find:DeprecationWarning:"]
 
 # https://mypy.readthedocs.io/en/stable/config_file.html
 [tool.mypy]

src/app_model/expressions/_context_keys.py

@@ -8,6 +8,7 @@
     Dict,
     Generic,
     List,
+    Literal,
     MutableMapping,
     NamedTuple,
     Optional,
@@ -17,8 +18,6 @@
     overload,
 )
 
-from typing_extensions import Literal
-
 from ._expressions import Name
 
 T = TypeVar("T")

src/app_model/registries/_commands_reg.py

@@ -2,18 +2,39 @@
 
 from concurrent.futures import Future, ThreadPoolExecutor
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    Iterator,
+    Optional,
+    Tuple,
+    TypeVar,
+    Union,
+    cast,
+)
 
 from in_n_out import Store
 from psygnal import Signal
-from typing_extensions import ParamSpec
 
+# maintain runtime compatibility with older typing_extensions
 if TYPE_CHECKING:
-    from typing import Dict, Iterator, Tuple
+    from typing_extensions import ParamSpec
 
-    DisposeCallable = Callable[[], None]
+    P = ParamSpec("P")
+else:
+    try:
+        from typing_extensions import ParamSpec
+
+        P = ParamSpec("P")
+    except ImportError:
+        P = TypeVar("P")
+
+
+DisposeCallable = Callable[[], None]
 
-P = ParamSpec("P")
 R = TypeVar("R")
 
 

src/app_model/types/_action.py

@@ -1,14 +1,26 @@
-from typing import Callable, Generic, List, Optional, TypeVar, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Callable, Generic, List, Optional, TypeVar, Union
 
 from pydantic import Field, validator
-from typing_extensions import ParamSpec
 
 from ._command_rule import CommandRule
 from ._keybinding_rule import KeyBindingRule
 from ._menu_rule import MenuRule
 from ._utils import _validate_python_name
 
-P = ParamSpec("P")
+# maintain runtime compatibility with older typing_extensions
+if TYPE_CHECKING:
+    from typing_extensions import ParamSpec
+
+    P = ParamSpec("P")
+else:
+    try:
+        from typing_extensions import ParamSpec
+
+        P = ParamSpec("P")
+    except ImportError:
+        P = TypeVar("P")
 R = TypeVar("R")