Skip to content

Commit 986e745

Browse files
committed
fix: import from typing_extensions instead of typing
1 parent 8eb0486 commit 986e745

38 files changed

+60
-53
lines changed

examples/connect/databricks/fastapi/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
from __future__ import annotations
44

55
import os
6-
from typing import TYPE_CHECKING, Annotated
76

87
from databricks import sql
98
from databricks.sdk.core import Config, databricks_cli
109
from fastapi import FastAPI, Header
10+
from typing_extensions import TYPE_CHECKING, Annotated
1111

1212
from posit.connect.external.databricks import PositCredentialsStrategy
1313

integration/tests/posit/connect/test_content_item_permissions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from __future__ import annotations
22

3-
from typing import TYPE_CHECKING
4-
53
import pytest
4+
from typing_extensions import TYPE_CHECKING
65

76
from posit import connect
87

src/posit/connect/_api.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from __future__ import annotations
55

66
from collections.abc import Mapping
7-
from typing import TYPE_CHECKING, Any, Optional, cast
7+
8+
from typing_extensions import TYPE_CHECKING, Any, Optional, cast
89

910
from ._api_call import ApiCallMixin, get_api
1011
from ._json import Jsonifiable, JsonifiableDict, ResponseAttrs

src/posit/connect/_api_call.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from __future__ import annotations
22

33
import posixpath
4-
from typing import TYPE_CHECKING, Protocol
4+
5+
from typing_extensions import TYPE_CHECKING, Protocol
56

67
if TYPE_CHECKING:
78
from ._json import Jsonifiable

src/posit/connect/_json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Dict, List, Tuple, TypeVar, Union
1+
from typing_extensions import Dict, List, Tuple, TypeVar, Union
22

33
# Implemented in https://github.com/posit-dev/py-shiny/blob/415ced034e6c500adda524abb7579731c32088b5/shiny/types.py#L357-L386
44
# Table from: https://github.com/python/cpython/blob/df1eec3dae3b1eddff819fd70f58b03b3fbd0eda/Lib/json/encoder.py#L77-L95

src/posit/connect/_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import Any
3+
from typing_extensions import Any
44

55

66
def drop_none(x: dict[str, Any]) -> dict[str, Any]:

src/posit/connect/bundles.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from __future__ import annotations
44

55
import io
6-
from typing import TYPE_CHECKING, List
6+
7+
from typing_extensions import TYPE_CHECKING, List
78

89
from . import resources, tasks
910

src/posit/connect/client.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, overload
6-
75
from requests import Response, Session
6+
from typing_extensions import TYPE_CHECKING, overload
87

98
from . import hooks, me
109
from .auth import Auth

src/posit/connect/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"""Client configuration."""
22

33
import os
4-
from typing import Optional
4+
5+
from typing_extensions import Optional
56

67
from . import urls
78

src/posit/connect/content.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44

55
import posixpath
66
import time
7-
from typing import (
7+
8+
from typing_extensions import (
89
TYPE_CHECKING,
910
Any,
1011
List,
1112
Literal,
13+
NotRequired,
1214
Optional,
15+
Required,
16+
TypedDict,
17+
Unpack,
1318
cast,
1419
overload,
1520
)
1621

17-
from typing_extensions import NotRequired, Required, TypedDict, Unpack
18-
1922
from . import tasks
2023
from ._api import ApiDictEndpoint, JsonifiableDict
2124
from .bundles import Bundles

src/posit/connect/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import functools
44
import weakref
5-
from typing import TYPE_CHECKING, Protocol
65

76
from packaging.version import Version
7+
from typing_extensions import TYPE_CHECKING, Protocol
88

99
if TYPE_CHECKING:
1010
from .client import Client

src/posit/connect/cursors.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from __future__ import annotations
22

33
from dataclasses import dataclass
4-
from typing import TYPE_CHECKING, Any, Generator, List
4+
5+
from typing_extensions import TYPE_CHECKING, Any, Generator, List
56

67
if TYPE_CHECKING:
78
from .context import Context

src/posit/connect/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import TYPE_CHECKING, Any, Iterator, List, Mapping, MutableMapping, Optional
3+
from typing_extensions import TYPE_CHECKING, Any, Iterator, List, Mapping, MutableMapping, Optional
44

55
from .resources import Resources
66

src/posit/connect/environments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from __future__ import annotations
22

33
from abc import abstractmethod
4-
from typing import Protocol
54

65
from typing_extensions import (
76
List,
87
Literal,
8+
Protocol,
99
TypedDict,
1010
runtime_checkable,
1111
)

src/posit/connect/errors.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import json
2-
from typing import Any
2+
3+
from typing_extensions import Any
34

45

56
class ClientError(Exception):

src/posit/connect/external/databricks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"""
77

88
import abc
9-
from typing import Callable, Dict, Optional
109

1110
import requests
11+
from typing_extensions import Callable, Dict, Optional
1212

1313
from ..client import Client
1414
from ..oauth import Credentials

src/posit/connect/external/snowflake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
NOTE: The APIs in this module are provided as a convenience and are subject to breaking changes.
44
"""
55

6-
from typing import Optional
6+
from typing_extensions import Optional
77

88
from ..client import Client
99
from .external import is_local

src/posit/connect/groups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, List, Optional, overload
5+
from typing_extensions import TYPE_CHECKING, List, Optional, overload
66

77
from .paginator import Paginator
88
from .resources import BaseResource, Resources

src/posit/connect/jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import (
3+
from typing_extensions import (
44
Iterable,
55
Literal,
66
Protocol,

src/posit/connect/metrics/shiny_usage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import List, overload
3+
from typing_extensions import List, overload
44

55
from ..cursors import CursorPaginator
66
from ..resources import BaseResource, Resources

src/posit/connect/metrics/usage.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
from __future__ import annotations
44

5-
from typing import List, overload
6-
75
from requests.sessions import Session as Session
6+
from typing_extensions import List, overload
87

98
from .. import resources
109
from . import shiny_usage, visits

src/posit/connect/metrics/visits.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import List, overload
3+
from typing_extensions import List, overload
44

55
from ..cursors import CursorPaginator
66
from ..resources import BaseResource, Resources

src/posit/connect/oauth/associations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""OAuth association resources."""
22

3-
from typing import List
3+
from typing_extensions import List
44

55
from ..context import Context
66
from ..resources import BaseResource, Resources

src/posit/connect/oauth/integrations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""OAuth integration resources."""
22

3-
from typing import List, Optional, overload
3+
from typing_extensions import List, Optional, overload
44

55
from ..resources import BaseResource, Resources
66
from .associations import IntegrationAssociations

src/posit/connect/oauth/oauth.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from __future__ import annotations
22

33
import os
4-
from typing import TYPE_CHECKING, Optional
54

6-
from typing_extensions import TypedDict
5+
from typing_extensions import TYPE_CHECKING, Optional, TypedDict
76

87
from ..resources import Resources
98
from .integrations import Integrations

src/posit/connect/oauth/sessions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""OAuth session resources."""
22

3-
from typing import List, Optional, overload
3+
from typing_extensions import List, Optional, overload
44

55
from ..resources import BaseResource, Resources
66

src/posit/connect/paginator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from __future__ import annotations
22

33
from dataclasses import dataclass
4-
from typing import TYPE_CHECKING, Generator, List
4+
5+
from typing_extensions import TYPE_CHECKING, Generator, List
56

67
if TYPE_CHECKING:
78
from .context import Context

src/posit/connect/permissions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, List, Optional, overload
6-
75
from requests.sessions import Session as Session
6+
from typing_extensions import TYPE_CHECKING, List, Optional, overload
87

98
from .resources import BaseResource, Resources
109

src/posit/connect/resources.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import posixpath
44
import warnings
55
from abc import ABC
6-
from typing import (
6+
7+
from typing_extensions import (
78
TYPE_CHECKING,
89
Any,
910
Hashable,

src/posit/connect/system.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, List, Literal, overload
6-
7-
from typing_extensions import TypedDict, Unpack
5+
from typing_extensions import TYPE_CHECKING, List, Literal, TypedDict, Unpack, overload
86

97
from .context import ContextManager
108
from .resources import Active

src/posit/connect/tags.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from __future__ import annotations
22

33
from abc import ABC, abstractmethod
4-
from typing import TYPE_CHECKING, Optional, overload
54

6-
from typing_extensions import NotRequired, TypedDict, Unpack
5+
from typing_extensions import TYPE_CHECKING, NotRequired, Optional, TypedDict, Unpack, overload
76

87
from .context import Context, ContextManager
98
from .resources import Active

src/posit/connect/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import overload
5+
from typing_extensions import overload
66

77
from . import resources
88

src/posit/connect/users.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING, List, Literal
6-
7-
from typing_extensions import NotRequired, Required, TypedDict, Unpack
5+
from typing_extensions import (
6+
TYPE_CHECKING,
7+
List,
8+
Literal,
9+
NotRequired,
10+
Required,
11+
TypedDict,
12+
Unpack,
13+
)
814

915
from . import me
1016
from .content import Content

src/posit/connect/vanities.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from typing import Callable, List, Optional
2-
3-
from typing_extensions import NotRequired, Required, TypedDict, Unpack
1+
from typing_extensions import Callable, List, NotRequired, Optional, Required, TypedDict, Unpack
42

53
from .context import Context
64
from .errors import ClientError

src/posit/connect/variants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import List
1+
from typing_extensions import List
22

33
from .context import Context
44
from .resources import BaseResource, Resources

tests/posit/connect/external/test_databricks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import base64
2-
from typing import Dict
32
from unittest.mock import patch
43

54
import pytest
65
import responses
6+
from typing_extensions import Dict
77

88
from posit.connect import Client
99
from posit.connect.external.databricks import (

tests/posit/connect/test_jobs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
from typing import TYPE_CHECKING
2-
31
import pytest
42
import responses
53
from requests.exceptions import HTTPError
4+
from typing_extensions import TYPE_CHECKING
65

76
from posit.connect.client import Client
87

tests/posit/connect/test_resources.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import warnings
2-
from typing import Optional
32
from unittest import mock
43
from unittest.mock import Mock
54

5+
from typing_extensions import Optional
6+
67
from posit.connect.resources import BaseResource
78

89
config = Mock()

0 commit comments

Comments
 (0)