Merge pull request #533 from henryiii/patch-1

chore: bump pyupgrade to  Python 3.6+

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -19,6 +19,7 @@ repos:
     rev: v2.10.0
     hooks:
     - id: pyupgrade
+      args: [--py36-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v1.16.0
     hooks:

setup.py

@@ -9,7 +9,6 @@
 
 pip usage is recommended
 """
-from __future__ import print_function
 import os
 import sys
 import setuptools
@@ -34,7 +33,7 @@ def scm_config():
     def parse(root):
         try:
             return parse_pkginfo(root)
-        except IOError:
+        except OSError:
             return parse_git(root)
 
     config = dict(

src/setuptools_scm/__init__.py

@@ -11,7 +11,7 @@
     DEFAULT_LOCAL_SCHEME,
     DEFAULT_TAG_REGEX,
 )
-from .utils import function_has_arg, string_types, trace
+from .utils import function_has_arg, trace
 from .version import format_version, meta
 from .discover import iter_matching_entrypoints
 
@@ -69,7 +69,7 @@ def _version_from_entrypoints(config, fallback=False):
 
 
 def dump_version(root, version, write_to, template=None):
-    assert isinstance(version, string_types)
+    assert isinstance(version, str)
     if not write_to:
         return
     target = os.path.normpath(os.path.join(root, write_to))
@@ -117,7 +117,7 @@ def _do_parse(config):
 
     if config.parse:
         parse_result = _call_entrypoint_fn(config.absolute_root, config, config.parse)
-        if isinstance(parse_result, string_types):
+        if isinstance(parse_result, str):
             raise TypeError(
                 "version parse result was a string\nplease return a parsed version"
             )

src/setuptools_scm/__main__.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 from setuptools_scm import get_version
 from setuptools_scm.integration import find_files

src/setuptools_scm/config.py

@@ -1,5 +1,4 @@
 """ configuration """
-from __future__ import print_function, unicode_literals
 import os
 import re
 import warnings
@@ -48,7 +47,7 @@ def _check_absolute_root(root, relative_to):
     return os.path.abspath(root)
 
 
-class Configuration(object):
+class Configuration:
     """ Global configuration model """
 
     def __init__(

src/setuptools_scm/git.py

@@ -13,7 +13,7 @@
 DEFAULT_DESCRIBE = "git describe --dirty --tags --long --match *[0-9]*"
 
 
-class GitWorkdir(object):
+class GitWorkdir:
     """experimental, may change at any time"""
 
     def __init__(self, path):
@@ -82,7 +82,7 @@ def count_all_nodes(self):
 def warn_on_shallow(wd):
     """experimental, may change at any time"""
     if wd.is_shallow():
-        warnings.warn('"{}" is shallow and may cause errors'.format(wd.path))
+        warnings.warn(f'"{wd.path}" is shallow and may cause errors')
 
 
 def fetch_on_shallow(wd):

src/setuptools_scm/hg.py

@@ -83,7 +83,7 @@ def get_latest_normalizable_tag(root):
 
 
 def get_graph_distance(root, rev1, rev2="."):
-    cmd = ["hg", "log", "-q", "-r", "{}::{}".format(rev1, rev2)]
+    cmd = ["hg", "log", "-q", "-r", f"{rev1}::{rev2}"]
     out = do(cmd, root)
     return len(out.strip().splitlines()) - 1
 

src/setuptools_scm/utils.py

@@ -1,23 +1,18 @@
 """
 utils
 """
-from __future__ import print_function, unicode_literals
 import inspect
 import warnings
 import sys
 import shlex
 import subprocess
 import os
-import io
 import platform
 import traceback
 
 
 DEBUG = bool(os.environ.get("SETUPTOOLS_SCM_DEBUG"))
 IS_WINDOWS = platform.system() == "Windows"
-PY2 = sys.version_info < (3,)
-PY3 = sys.version_info > (3,)
-string_types = (str,) if PY3 else (str, unicode)  # noqa
 
 
 def no_git_env(env):
@@ -63,7 +58,7 @@ def _always_strings(env_dict):
     On Windows and Python 2, environment dictionaries must be strings
     and not unicode.
     """
-    if IS_WINDOWS or PY2:
+    if IS_WINDOWS:
         env_dict.update((key, str(value)) for (key, value) in env_dict.items())
     return env_dict
 
@@ -111,7 +106,7 @@ def do(cmd, cwd="."):
 
 
 def data_from_mime(path):
-    with io.open(path, encoding="utf-8") as fp:
+    with open(path, encoding="utf-8") as fp:
         content = fp.read()
     trace("content", repr(content))
     # the complex conditions come from reading pseudo-mime-messages
@@ -123,11 +118,7 @@ def data_from_mime(path):
 def function_has_arg(fn, argname):
     assert inspect.isfunction(fn)
 
-    if PY2:
-        argspec = inspect.getargspec(fn).args
-    else:
-
-        argspec = inspect.signature(fn).parameters
+    argspec = inspect.signature(fn).parameters
 
     return argname in argspec
 
@@ -148,4 +139,4 @@ def has_command(name, warn=True):
 
 def require_command(name):
     if not has_command(name, warn=False):
-        raise EnvironmentError("%r was not found" % name)
+        raise OSError("%r was not found" % name)

src/setuptools_scm/version.py

@@ -1,12 +1,11 @@
-from __future__ import print_function
 import datetime
 import warnings
 import re
 import time
 import os
 
 from .config import Configuration
-from .utils import trace, string_types
+from .utils import trace
 
 try:
     from packaging.version import Version
@@ -24,7 +23,7 @@
 
 
 def _parse_version_tag(tag, config):
-    tagstring = tag if not isinstance(tag, string_types) else str(tag)
+    tagstring = tag if not isinstance(tag, str) else str(tag)
     match = config.tag_regex.match(tagstring)
 
     result = None
@@ -40,7 +39,7 @@ def _parse_version_tag(tag, config):
             "suffix": match.group(0)[match.end(key) :],
         }
 
-    trace("tag '{}' parsed to {}".format(tag, result))
+    trace(f"tag '{tag}' parsed to {result}")
     return result
 
 
@@ -67,7 +66,7 @@ def tag_to_version(tag, config=None):
 
     tagdict = _parse_version_tag(tag, config)
     if not isinstance(tagdict, dict) or not tagdict.get("version", None):
-        warnings.warn("tag {!r} no version found".format(tag))
+        warnings.warn(f"tag {tag!r} no version found")
         return None
 
     version = tagdict["version"]
@@ -100,7 +99,7 @@ def tags_to_versions(tags, config=None):
     return result
 
 
-class ScmVersion(object):
+class ScmVersion:
     def __init__(
         self,
         tag_version,
@@ -111,7 +110,7 @@ def __init__(
         branch=None,
         config=None,
         node_date=None,
-        **kw
+        **kw,
     ):
         if kw:
             trace("unknown args", kw)
@@ -157,7 +156,7 @@ def format_with(self, fmt, **kw):
             dirty=self.dirty,
             branch=self.branch,
             node_date=self.node_date,
-            **kw
+            **kw,
         )
 
     def format_choice(self, clean_format, dirty_format, **kw):
@@ -184,7 +183,7 @@ def meta(
     preformatted=False,
     branch=None,
     config=None,
-    **kw
+    **kw,
 ):
     if not config:
         warnings.warn(
@@ -247,9 +246,7 @@ def guess_next_simple_semver(version, retain, increment=True):
     try:
         parts = [int(i) for i in str(version).split(".")[:retain]]
     except ValueError:
-        raise ValueError(
-            "{version} can't be parsed as numeric version".format(version=version)
-        )
+        raise ValueError(f"{version} can't be parsed as numeric version")
     while len(parts) < retain:
         parts.append(0)
     if increment:

testing/conftest.py

@@ -15,16 +15,16 @@ def pytest_report_header():
     for pkg in VERSION_PKGS:
         version = pkg_resources.get_distribution(pkg).version
         path = __import__(pkg).__file__
-        res.append("{} version {} from {!r}".format(pkg, version, path))
+        res.append(f"{pkg} version {version} from {path!r}")
     return res
 
 
-class Wd(object):
+class Wd:
     commit_command = None
     add_command = None
 
     def __repr__(self):
-        return "<WD {cwd}>".format(cwd=self.cwd)
+        return f"<WD {self.cwd}>"
 
     def __init__(self, cwd):
         self.cwd = cwd