Skip to content

Commit 3e8fa61

Browse files
committed
remove use of the deprecated pkg_resources
1 parent bff6799 commit 3e8fa61

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

wes_client/wes_client_main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import os
66
import sys
77
import time
8+
from importlib.metadata import version
89
from typing import List
910

10-
import pkg_resources # part of setuptools
1111
import requests
1212
from requests.exceptions import InvalidSchema, MissingSchema
1313

@@ -75,8 +75,7 @@ def main(argv: List[str] = sys.argv[1:]) -> int:
7575
args = parser.parse_args(argv)
7676

7777
if args.version:
78-
pkg = pkg_resources.require("wes_service")
79-
print(f"{sys.argv[0]} {pkg[0].version}")
78+
print(version("wes_service"))
8079
exit(0)
8180

8281
auth = {}

wes_service/cwl_runner.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ def getlog(self) -> Dict[str, Any]:
160160

161161
def cancel(self) -> None:
162162
"""Cancel the workflow, if possible."""
163-
pass
164163

165164

166165
class CWLRunnerBackend(WESBackend):

wes_service/toil_wes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ def call_cmd(self, cmd: Union[List[str], str], cwd: str) -> int:
147147

148148
def cancel(self) -> None:
149149
"""Cancel the run (currently a no-op for Toil)."""
150-
pass
151150

152151
def fetch(self, filename: str) -> str:
153152
"""Retrieve a files contents, if it exists."""

wes_service/wes_service_main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import logging
44
import os
55
import sys
6+
from importlib.metadata import version
67
from typing import List, Optional, cast
78

89
import connexion # type: ignore[import-untyped]
910
import connexion.utils as utils # type: ignore[import-untyped]
10-
import pkg_resources # part of setuptools
1111
import ruamel.yaml
1212
from connexion.resolver import Resolver # type: ignore[import-untyped]
1313

@@ -73,8 +73,7 @@ def main(argv: List[str] = sys.argv[1:]) -> None:
7373
args = get_parser().parse_args(argv)
7474

7575
if args.version:
76-
pkg = pkg_resources.require("wes_service")
77-
print(f"{sys.argv[0]} {pkg[0].version}")
76+
print(version("wes_service"))
7877
exit(0)
7978

8079
app = setup(args)

0 commit comments

Comments
 (0)