diff --git a/gdtoolkit/formatter/__main__.py b/gdtoolkit/formatter/__main__.py index 77bfd2f7..e740258d 100644 --- a/gdtoolkit/formatter/__main__.py +++ b/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"]: diff --git a/gdtoolkit/gd2py/__main__.py b/gdtoolkit/gd2py/__main__.py index 45e3ea45..49c3a609 100644 --- a/gdtoolkit/gd2py/__main__.py +++ b/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[""], "r", encoding="utf-8") as handle: print(convert_code(handle.read())) diff --git a/gdtoolkit/gdradon/__main__.py b/gdtoolkit/gdradon/__main__.py index 5e9dfc03..121437ac 100644 --- a/gdtoolkit/gdradon/__main__.py +++ b/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[""]) diff --git a/gdtoolkit/linter/__main__.py b/gdtoolkit/linter/__main__.py index e85b6452..ca2fc080 100644 --- a/gdtoolkit/linter/__main__.py +++ b/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"]: diff --git a/gdtoolkit/parser/__main__.py b/gdtoolkit/parser/__main__.py index 95a4b0cf..294667c7 100644 --- a/gdtoolkit/parser/__main__.py +++ b/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[""] diff --git a/gdtoolkit/parser/parser.py b/gdtoolkit/parser/parser.py index be0545e9..3ff7569a 100644 --- a/gdtoolkit/parser/parser.py +++ b/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)