diff options
author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2023-01-18 15:55:54 +0100 |
---|---|---|
committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2023-01-18 15:55:54 +0100 |
commit | ccd461b70adf6d8417a1a3474d63d6d72ee27761 (patch) | |
tree | 439fbf2dc5fe084bcf4fd4f380e93325ffc26c2c /src/setuptools_scm | |
parent | 78e7d6bb470e3c0ae5fd744e572f6e6085401a33 (diff) | |
download | setuptools-scm-ccd461b70adf6d8417a1a3474d63d6d72ee27761.tar.gz |
drop unnecessary type-checking guards
Diffstat (limited to 'src/setuptools_scm')
-rw-r--r-- | src/setuptools_scm/_modify_version.py | 8 | ||||
-rw-r--r-- | src/setuptools_scm/_types.py | 11 | ||||
-rw-r--r-- | src/setuptools_scm/config.py | 6 | ||||
-rw-r--r-- | src/setuptools_scm/discover.py | 4 | ||||
-rw-r--r-- | src/setuptools_scm/file_finder.py | 6 | ||||
-rw-r--r-- | src/setuptools_scm/file_finder_git.py | 5 | ||||
-rw-r--r-- | src/setuptools_scm/file_finder_hg.py | 5 | ||||
-rw-r--r-- | src/setuptools_scm/git.py | 8 |
8 files changed, 16 insertions, 37 deletions
diff --git a/src/setuptools_scm/_modify_version.py b/src/setuptools_scm/_modify_version.py index dc80c1a..0be79c2 100644 --- a/src/setuptools_scm/_modify_version.py +++ b/src/setuptools_scm/_modify_version.py @@ -1,10 +1,8 @@ from __future__ import annotations import re -from typing import TYPE_CHECKING -if TYPE_CHECKING: - from .version import ScmVersion +from . import _types as _t def _strip_local(version_string: str) -> str: @@ -47,7 +45,7 @@ def _bump_regex(version: str) -> str: return "%s%d" % (prefix, int(tail) + 1) -def _format_local_with_time(version: ScmVersion, time_format: str) -> str: +def _format_local_with_time(version: _t.SCMVERSION, time_format: str) -> str: if version.exact or version.node is None: return version.format_choice( @@ -59,6 +57,6 @@ def _format_local_with_time(version: ScmVersion, time_format: str) -> str: ) -def _dont_guess_next_version(tag_version: ScmVersion) -> str: +def _dont_guess_next_version(tag_version: _t.SCMVERSION) -> str: version = _strip_local(str(tag_version.tag)) return _bump_dev(version) or _add_post(version) diff --git a/src/setuptools_scm/_types.py b/src/setuptools_scm/_types.py index c19bf35..4dbfddf 100644 --- a/src/setuptools_scm/_types.py +++ b/src/setuptools_scm/_types.py @@ -1,19 +1,18 @@ from __future__ import annotations +import os from typing import Any from typing import Callable from typing import List from typing import Tuple -from typing import TYPE_CHECKING from typing import TypeVar from typing import Union +from typing_extensions import ParamSpec +from typing_extensions import Protocol +from typing_extensions import TypeAlias -if TYPE_CHECKING: - from setuptools_scm import version - import os - -from typing_extensions import ParamSpec, TypeAlias, Protocol +from setuptools_scm import version PathT: TypeAlias = Union["os.PathLike[str]", str] diff --git a/src/setuptools_scm/config.py b/src/setuptools_scm/config.py index 0394eba..3cb6aa0 100644 --- a/src/setuptools_scm/config.py +++ b/src/setuptools_scm/config.py @@ -8,8 +8,8 @@ import warnings from typing import Any from typing import Callable from typing import Pattern -from typing import TYPE_CHECKING +from . import _types as _t from ._integration.pyproject_reading import ( get_args_for_pyproject as _get_args_for_pyproject, ) @@ -18,10 +18,6 @@ from ._version_cls import _VersionT from ._version_cls import Version as _Version from .utils import trace - -if TYPE_CHECKING: - from . import _types as _t - DEFAULT_TAG_REGEX = re.compile( r"^(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$" ) diff --git a/src/setuptools_scm/discover.py b/src/setuptools_scm/discover.py index f7843ee..87533fd 100644 --- a/src/setuptools_scm/discover.py +++ b/src/setuptools_scm/discover.py @@ -3,10 +3,8 @@ from __future__ import annotations import os from typing import Iterable from typing import Iterator -from typing import TYPE_CHECKING -if TYPE_CHECKING: - from . import _types as _t +from . import _types as _t from .config import Configuration from .utils import trace diff --git a/src/setuptools_scm/file_finder.py b/src/setuptools_scm/file_finder.py index f14a946..93d87b1 100644 --- a/src/setuptools_scm/file_finder.py +++ b/src/setuptools_scm/file_finder.py @@ -1,12 +1,10 @@ from __future__ import annotations import os -from typing import TYPE_CHECKING -if TYPE_CHECKING: - from typing_extensions import TypeGuard - from . import _types as _t +from typing_extensions import TypeGuard +from . import _types as _t from .utils import trace diff --git a/src/setuptools_scm/file_finder_git.py b/src/setuptools_scm/file_finder_git.py index 775c49d..65aa999 100644 --- a/src/setuptools_scm/file_finder_git.py +++ b/src/setuptools_scm/file_finder_git.py @@ -5,17 +5,14 @@ import os import subprocess import tarfile from typing import IO -from typing import TYPE_CHECKING +from . import _types as _t from .file_finder import is_toplevel_acceptable from .file_finder import scm_find_files from .utils import data_from_mime from .utils import do_ex from .utils import trace -if TYPE_CHECKING: - from . import _types as _t - log = logging.getLogger(__name__) diff --git a/src/setuptools_scm/file_finder_hg.py b/src/setuptools_scm/file_finder_hg.py index 2ce974f..b750fea 100644 --- a/src/setuptools_scm/file_finder_hg.py +++ b/src/setuptools_scm/file_finder_hg.py @@ -2,17 +2,14 @@ from __future__ import annotations import os import subprocess -from typing import TYPE_CHECKING +from . import _types as _t from .file_finder import is_toplevel_acceptable from .file_finder import scm_find_files from .utils import data_from_mime from .utils import do_ex from .utils import trace -if TYPE_CHECKING: - from . import _types as _t - def _hg_toplevel(path: str) -> str | None: try: diff --git a/src/setuptools_scm/git.py b/src/setuptools_scm/git.py index a0a7955..1da5577 100644 --- a/src/setuptools_scm/git.py +++ b/src/setuptools_scm/git.py @@ -9,8 +9,8 @@ from os.path import isfile from os.path import join from os.path import samefile from typing import Callable -from typing import TYPE_CHECKING +from . import _types as _t from .config import Configuration from .scm_workdir import Workdir from .utils import _CmdResult @@ -21,11 +21,7 @@ from .utils import trace from .version import meta from .version import ScmVersion from .version import tags_to_versions - -if TYPE_CHECKING: - from . import _types as _t - - from setuptools_scm.hg_git import GitWorkdirHgClient +from setuptools_scm.hg_git import GitWorkdirHgClient REF_TAG_RE = re.compile(r"(?<=\btag: )([^,]+)\b") DESCRIBE_UNSUPPORTED = "%(describe" |