Bump minimal python to 3.7

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
     rev: v3.1.0
     hooks:
     -   id: reorder-python-imports
-        args: [ "--application-directories=.:src" , --py3-plus]
+        args: [ "--application-directories=.:src" , --py37-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.2.0
     hooks:
@@ -26,7 +26,7 @@ repos:
     rev: v2.32.0
     hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args: [--py37-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v1.20.1
     hooks:

CHANGELOG.rst

@@ -1,3 +1,10 @@
+v7.0.0
+=======
+
+* drop python 3.6 support
+* include git archival support
+
+
 v6.4.3
 ======
 

mypy.ini

@@ -1,10 +1,10 @@
 [mypy]
-python_version = 3.6
+python_version = 3.7
 warn_return_any = True
 warn_unused_configs = True
 mypy_path = $MYPY_CONFIG_FILE_DIR/src
 
 [mypy-setuptools_scm.*]
 # disabled as it will take a bit
 # disallow_untyped_defs = True
-# strict = true
+strict = true

setup.cfg

@@ -15,7 +15,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -31,7 +30,7 @@ install_requires =
     packaging>=20.0
     setuptools
     tomli>=1.0.0 # keep in sync
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     =src
 zip_safe = true

setup.py

@@ -9,29 +9,15 @@
 
 pip usage is recommended
 """
+from __future__ import annotations
+
 import os
 import sys
-from typing import NoReturn
-from typing import Optional
 
 import setuptools
-from setuptools.command.bdist_egg import bdist_egg as original_bdist_egg
-
-
-class bdist_egg(original_bdist_egg):
-    def run(self) -> NoReturn:
-        raise SystemExit(
-            "%s is forbidden, "
-            "please update to setuptools>=45 which uses pip" % type(self).__name__
-        )
 
 
 def scm_version() -> str:
-
-    if sys.version_info < (3, 6):
-        raise RuntimeError(
-            "support for python < 3.6 has been removed in setuptools_scm>=6.0.0"
-        )
     here = os.path.dirname(os.path.abspath(__file__))
     src = os.path.join(here, "src")
 
@@ -46,7 +32,7 @@ def scm_version() -> str:
 
     from setuptools_scm.version import ScmVersion
 
-    def parse(root: str, config: Configuration) -> Optional[ScmVersion]:
+    def parse(root: str, config: Configuration) -> ScmVersion | None:
         try:
             return parse_pkginfo(root, config)
         except OSError:
@@ -69,5 +55,4 @@ def parse(root: str, config: Configuration) -> Optional[ScmVersion]:
             ],
             "test": ["pytest>=6.2", "virtualenv>20"],
         },
-        cmdclass={"bdist_egg": bdist_egg},
     )

src/setuptools_scm/__init__.py

@@ -2,13 +2,13 @@
 :copyright: 2010-2015 by Ronny Pfannschmidt
 :license: MIT
 """
+from __future__ import annotations
+
 import os
 import warnings
 from typing import Any
 from typing import Callable
-from typing import Optional
 from typing import TYPE_CHECKING
-from typing import Union
 
 from . import _types as _t
 from ._entrypoints import _call_entrypoint_fn
@@ -46,7 +46,7 @@
 }
 
 
-def version_from_scm(root: _t.PathT) -> Optional[ScmVersion]:
+def version_from_scm(root: _t.PathT) -> ScmVersion | None:
     warnings.warn(
         "version_from_scm is deprecated please use get_version",
         category=DeprecationWarning,
@@ -60,7 +60,7 @@ def dump_version(
     root: _t.PathT,
     version: str,
     write_to: _t.PathT,
-    template: "str | None" = None,
+    template: str | None = None,
 ) -> None:
     assert isinstance(version, str)
     target = os.path.normpath(os.path.join(root, write_to))
@@ -79,7 +79,7 @@ def dump_version(
         fp.write(template.format(version=version, version_tuple=version_tuple))
 
 
-def _do_parse(config: Configuration) -> "ScmVersion|None":
+def _do_parse(config: Configuration) -> ScmVersion | None:
     pretended = _read_pretended_version_for(config)
     if pretended is not None:
         return pretended
@@ -90,7 +90,7 @@ def _do_parse(config: Configuration) -> "ScmVersion|None":
             raise TypeError(
                 f"version parse result was {str!r}\nplease return a parsed version"
             )
-        version: Optional[ScmVersion]
+        version: ScmVersion | None
         if parse_result:
             assert isinstance(parse_result, ScmVersion)
             version = parse_result
@@ -105,7 +105,7 @@ def _do_parse(config: Configuration) -> "ScmVersion|None":
     return version
 
 
-def _version_missing(config: Configuration) -> "NoReturn":
+def _version_missing(config: Configuration) -> NoReturn:
     raise LookupError(
         f"setuptools-scm was unable to detect version for {config.absolute_root}.\n\n"
         "Make sure you're either building from a fully intact git repository "
@@ -120,19 +120,19 @@ def _version_missing(config: Configuration) -> "NoReturn":
 
 def get_version(
     root: str = ".",
-    version_scheme: Union[Callable[[ScmVersion], str], str] = DEFAULT_VERSION_SCHEME,
-    local_scheme: Union[Callable[[ScmVersion], str], str] = DEFAULT_LOCAL_SCHEME,
-    write_to: Optional[_t.PathT] = None,
-    write_to_template: Optional[str] = None,
-    relative_to: Optional[str] = None,
+    version_scheme: Callable[[ScmVersion], str] | str = DEFAULT_VERSION_SCHEME,
+    local_scheme: Callable[[ScmVersion], str] | str = DEFAULT_LOCAL_SCHEME,
+    write_to: _t.PathT | None = None,
+    write_to_template: str | None = None,
+    relative_to: str | None = None,
     tag_regex: str = DEFAULT_TAG_REGEX,
-    parentdir_prefix_version: Optional[str] = None,
-    fallback_version: Optional[str] = None,
+    parentdir_prefix_version: str | None = None,
+    fallback_version: str | None = None,
     fallback_root: _t.PathT = ".",
-    parse: Optional[Any] = None,
-    git_describe_command: Optional[Any] = None,
-    dist_name: Optional[str] = None,
-    version_cls: Optional[Any] = None,
+    parse: Any | None = None,
+    git_describe_command: Any | None = None,
+    dist_name: str | None = None,
+    version_cls: Any | None = None,
     normalize: bool = True,
     search_parent_directories: bool = False,
 ) -> str:
@@ -150,7 +150,7 @@ def get_version(
     return maybe_version
 
 
-def _get_version(config: Configuration) -> "str|None":
+def _get_version(config: Configuration) -> str | None:
     parsed_version = _do_parse(config)
     if parsed_version is None:
         return None

src/setuptools_scm/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from ._cli import main
 
 if __name__ == "__main__":

src/setuptools_scm/_cli.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import os
 import sys

src/setuptools_scm/_entrypoints.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
+
 import warnings
 from typing import Any
 from typing import Iterator
-from typing import Optional
 from typing import overload
 from typing import Protocol
 from typing import TYPE_CHECKING
@@ -21,17 +22,17 @@ class MaybeConfigFunction(Protocol):
     __name__: str
 
     @overload
-    def __call__(self, root: _t.PathT, config: Configuration) -> Optional[ScmVersion]:
+    def __call__(self, root: _t.PathT, config: Configuration) -> ScmVersion | None:
         pass
 
     @overload
-    def __call__(self, root: _t.PathT) -> Optional[ScmVersion]:
+    def __call__(self, root: _t.PathT) -> ScmVersion | None:
         pass
 
 
 def _call_entrypoint_fn(
     root: _t.PathT, config: Configuration, fn: MaybeConfigFunction
-) -> Optional[ScmVersion]:
+) -> ScmVersion | None:
     if function_has_arg(fn, "config"):
         return fn(root, config=config)
     else:
@@ -47,7 +48,7 @@ def _call_entrypoint_fn(
 
 def _version_from_entrypoints(
     config: Configuration, fallback: bool = False
-) -> "ScmVersion|None":
+) -> ScmVersion | None:
     if fallback:
         entrypoint = "setuptools_scm.parse_scm_fallback"
         root = config.fallback_root
@@ -59,7 +60,7 @@ def _version_from_entrypoints(
 
     trace("version_from_ep", entrypoint, root)
     for ep in iter_matching_entrypoints(root, entrypoint, config):
-        version: Optional[ScmVersion] = _call_entrypoint_fn(root, config, ep.load())
+        version: ScmVersion | None = _call_entrypoint_fn(root, config, ep.load())
         trace(ep, version)
         if version:
             return version
@@ -73,7 +74,7 @@ def _version_from_entrypoints(
 
 
 def iter_entry_points(
-    group: str, name: Optional[str] = None
+    group: str, name: str | None = None
 ) -> Iterator[_t.EntrypointProtocol]:
     all_eps = entry_points()
     if hasattr(all_eps, "select"):

src/setuptools_scm/_overrides.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import os
-from typing import Optional
 
 from .config import Configuration
 from .utils import trace
@@ -11,14 +12,14 @@
 PRETEND_KEY_NAMED = PRETEND_KEY + "_FOR_{name}"
 
 
-def _read_pretended_version_for(config: Configuration) -> Optional[ScmVersion]:
+def _read_pretended_version_for(config: Configuration) -> ScmVersion | None:
     """read a a overridden version from the environment
 
     tries ``SETUPTOOLS_SCM_PRETEND_VERSION``
     and ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_$UPPERCASE_DIST_NAME``
     """
     trace("dist name:", config.dist_name)
-    pretended: Optional[str]
+    pretended: str | None
     if config.dist_name is not None:
         pretended = os.environ.get(
             PRETEND_KEY_NAMED.format(name=config.dist_name.upper())