Skip to content

Migrated from pkg_resources to importlib #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrated from pkg_resources to importlib #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions gdtoolkit/formatter/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]:
Expand Down
4 changes: 2 additions & 2 deletions gdtoolkit/gd2py/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()))
6 changes: 2 additions & 4 deletions gdtoolkit/gdradon/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>"])
Expand Down
4 changes: 2 additions & 2 deletions gdtoolkit/linter/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]:
Expand Down
6 changes: 2 additions & 4 deletions gdtoolkit/parser/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>"]

Expand Down
4 changes: 2 additions & 2 deletions gdtoolkit/parser/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""
import os
import sys
import pkg_resources
from importlib.metadata import version as pkg_version

from lark import Lark, Tree

Expand Down Expand Up @@ -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)
Expand Down