Migrated from pkg_resources to importlib (#384)

Author: olivergs

gdtoolkit/formatter/__main__.py

@@ -32,7 +32,7 @@
 import difflib
 from typing import List, Tuple, Optional
 from types import MappingProxyType
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 from docopt import docopt
 import lark
@@ -58,9 +58,7 @@ def main():
     sys.stdout.reconfigure(encoding="utf-8")
     arguments = docopt(
         __doc__,
-        version="gdformat {}".format(
-            pkg_resources.get_distribution("gdtoolkit").version
-        ),
+        version="gdformat {}".format(pkg_version("gdtoolkit")),
     )
 
     if arguments["--dump-default-config"]:

gdtoolkit/gd2py/__main__.py

@@ -17,7 +17,7 @@
   gd2py ./addons/gut/gut.gd | radon cc -s -
 """
 import sys
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 from docopt import docopt
 
@@ -28,7 +28,7 @@ def main():
     sys.stdout.reconfigure(encoding="utf-8")
     arguments = docopt(
         __doc__,
-        version="gd2py {}".format(pkg_resources.get_distribution("gdtoolkit").version),
+        version="gd2py {}".format(pkg_version("gdtoolkit")),
     )
     with open(arguments["<path>"], "r", encoding="utf-8") as handle:
         print(convert_code(handle.read()))

gdtoolkit/gdradon/__main__.py

@@ -14,7 +14,7 @@
 """
 import sys
 from typing import List
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 from docopt import docopt
 from radon.complexity import cc_rank, cc_visit
@@ -31,9 +31,7 @@ def main():
     sys.stdout.reconfigure(encoding="utf-8")
     arguments = docopt(
         __doc__,
-        version="gdradon {}".format(
-            pkg_resources.get_distribution("gdtoolkit").version
-        ),
+        version="gdradon {}".format(pkg_version("gdtoolkit")),
     )
 
     files: List[Path] = find_gd_files_from_paths(arguments["<path>"])

gdtoolkit/linter/__main__.py

@@ -20,7 +20,7 @@
 import pathlib
 from typing import List, Optional
 from types import MappingProxyType
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 import lark
 import yaml
@@ -43,7 +43,7 @@
 def main():
     arguments = docopt(
         __doc__,
-        version="gdlint {}".format(pkg_resources.get_distribution("gdtoolkit").version),
+        version="gdlint {}".format(pkg_version("gdtoolkit")),
     )
 
     if arguments["--verbose"]:

gdtoolkit/parser/__main__.py

@@ -14,7 +14,7 @@
 """
 import sys
 from typing import Dict
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 import lark
 from docopt import docopt
@@ -29,9 +29,7 @@
 def main():
     arguments = docopt(
         __doc__,
-        version="gdparse {}".format(
-            pkg_resources.get_distribution("gdtoolkit").version
-        ),
+        version="gdparse {}".format(pkg_version("gdtoolkit")),
     )
     files = arguments["<file>"]
 

gdtoolkit/parser/parser.py

@@ -5,7 +5,7 @@
 """
 import os
 import sys
-import pkg_resources
+from importlib.metadata import version as pkg_version
 
 from lark import Lark, Tree
 
@@ -70,7 +70,7 @@ def _get_parser(
         add_metadata: bool = False,
         grammar_filename: str = "gdscript.lark",
     ) -> Lark:
-        version: str = pkg_resources.get_distribution("gdtoolkit").version
+        version: str = pkg_version("gdtoolkit")
         cache_dirpath: str = os.path.join(self._cache_dirpath, version)
         cache_filepath: str = os.path.join(cache_dirpath, name) + ".pickle"
         grammar_filepath: str = os.path.join(self._directory, grammar_filename)