Skip to content

Commit ebbc395

Browse files
Merge pull request #850 from gotmax23/no-extensions
remove typing_extensions runtime dep on >= py3.8
2 parents 6754be9 + 3b5e034 commit ebbc395

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ requires = [
88
"packaging>=20",
99
"setuptools>=55",
1010
'tomli; python_version < "3.11"',
11-
"typing_extensions",
11+
'typing_extensions; python_version < "3.8"',
1212
]
1313

1414
[project]
@@ -45,7 +45,7 @@ dependencies = [
4545
"packaging>=20",
4646
"setuptools",
4747
'tomli>=1; python_version < "3.11"',
48-
"typing-extensions",
48+
'typing-extensions; python_version < "3.11"',
4949
]
5050
[project.optional-dependencies]
5151
rich = [

src/setuptools_scm/_entrypoints.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
from __future__ import annotations
22

3+
import sys
34
from typing import Any
45
from typing import Callable
56
from typing import cast
67
from typing import Iterator
78
from typing import overload
89
from typing import TYPE_CHECKING
910

10-
from typing_extensions import Protocol
11+
if sys.version_info[:2] >= (3, 8):
12+
from typing import Protocol
13+
else:
14+
from typing_extensions import Protocol
1115

1216
from . import _log
1317
from . import version

src/setuptools_scm/_file_finders/__init__.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
import itertools
44
import os
55
from typing import Callable
6-
7-
from typing_extensions import TypeGuard
6+
from typing import TYPE_CHECKING
87

98
from .. import _log
109
from .. import _types as _t
1110
from .._entrypoints import iter_entry_points
1211

12+
if TYPE_CHECKING:
13+
from typing_extensions import TypeGuard
14+
15+
1316
log = _log.log.getChild("file_finder")
1417

1518

src/setuptools_scm/_integration/pyproject_reading.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
from typing import Callable
88
from typing import Dict
99
from typing import NamedTuple
10-
11-
from typing_extensions import TypeAlias
10+
from typing import TYPE_CHECKING
1211

1312
from .setuptools import read_dist_name_from_setup_cfg
1413

14+
if TYPE_CHECKING:
15+
from typing_extensions import TypeAlias
16+
1517
_ROOT = "root"
1618
TOML_RESULT: TypeAlias = Dict[str, Any]
1719
TOML_LOADER: TypeAlias = Callable[[str], TOML_RESULT]

src/setuptools_scm/_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from typing import TYPE_CHECKING
99
from typing import Union
1010

11-
from typing_extensions import TypeAlias
1211

1312
if TYPE_CHECKING:
13+
from typing_extensions import TypeAlias
1414
from . import version
1515

1616
PathT: TypeAlias = Union["os.PathLike[str]", str]

tox.ini

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ deps=
2727
pytest
2828
setuptools >= 45
2929
virtualenv>20
30-
typing_extensions
3130
commands=
3231
pytest []
3332

@@ -39,7 +38,7 @@ deps=
3938
check-manifest
4039
docutils
4140
pygments
42-
typing_extensions
41+
typing_extensions; python_version<'3.8'
4342
hatchling
4443
commands=
4544
rst2html.py README.rst {envlogdir}/README.html --strict []

0 commit comments

Comments
 (0)