diff --git a/setup.cfg b/setup.cfg index dc8d3768ef..d4b340352e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,7 @@ split_before_expression_after_opening_paren = true [isort] line_length = 79 multi_line_output = 0 -extra_standard_library = pkg_resources,setuptools,logging,os,warnings,abc +extra_standard_library = setuptools,logging,os,warnings,abc known_first_party = mmcv known_third_party = addict,cv2,matplotlib,numpy,onnx,packaging,pytest,pytorch_sphinx_theme,scipy,sphinx,torch,torchvision,yaml,yapf no_lines_before = STDLIB,LOCALFOLDER diff --git a/setup.py b/setup.py index c3e1f500d6..bd1ba1edff 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,8 @@ import os import platform import re -from pkg_resources import DistributionNotFound, get_distribution, parse_version +from importlib.metadata import version, PackageNotFoundError +from packaging.version import parse as parse_version from setuptools import find_packages, setup EXT_TYPE = '' @@ -33,8 +34,8 @@ def choose_requirement(primary, secondary): return secondary.""" try: name = re.split(r'[!<>=]', primary)[0] - get_distribution(name) - except DistributionNotFound: + version(name) + except PackageNotFoundError: return secondary return str(primary)