post merge fixup

Author: RonnyPfannschmidt

src/setuptools_scm/git.py

@@ -1,4 +1,5 @@
 import os
+import re
 import warnings
 from datetime import date
 from datetime import datetime
@@ -8,10 +9,12 @@
 
 from .config import Configuration
 from .scm_workdir import Workdir
+from .utils import data_from_mime
 from .utils import do_ex
 from .utils import require_command
 from .utils import trace
 from .version import meta
+from .version import tags_to_versions
 
 REF_TAG_RE = re.compile(r"(?<=\btag: )([^,]+)\b")
 DESCRIBE_UNSUPPORTED = "%(describe"

testing/test_git.py

@@ -8,10 +8,13 @@
 
 import pytest
 
+from setuptools_scm import Configuration
+from setuptools_scm import format_version
 from setuptools_scm import git
 from setuptools_scm import integration
 from setuptools_scm import NonNormalizedVersion
 from setuptools_scm.file_finder_git import git_find_files
+from setuptools_scm.git import archival_to_version
 from setuptools_scm.utils import do
 from setuptools_scm.utils import has_command