Skip to content

Commit e80c12e

Browse files
asottile-sentryMichael Howitz
authored andcommitted
replace pkg_resources with package+importlib.metadata
1 parent 2731a87 commit e80c12e

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

pytest_rerunfailures.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
import pytest
1414
from _pytest.outcomes import fail
1515
from _pytest.runner import runtestprotocol
16-
from pkg_resources import DistributionNotFound
17-
from pkg_resources import get_distribution
18-
from pkg_resources import parse_version
16+
from packaging.version import parse as parse_version
17+
18+
if sys.version_info >= (3, 8):
19+
import importlib.metadata as importlib_metadata
20+
else:
21+
import importlib_metadata
1922

2023
HAS_RESULTLOG = False
2124

@@ -50,10 +53,11 @@ def works_with_current_xdist():
5053
5154
"""
5255
try:
53-
d = get_distribution("pytest-xdist")
54-
return d.parsed_version >= parse_version("1.20")
55-
except DistributionNotFound:
56+
d = importlib_metadata.distribution("pytest-xdist")
57+
except importlib_metadata.PackageNotFoundError:
5658
return None
59+
else:
60+
return parse_version(d.version) >= parse_version("1.20")
5761

5862

5963
# command line options

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ zip_safe = False
4141
py_modules = pytest_rerunfailures
4242
python_requires = >= 3.6
4343
install_requires =
44-
setuptools >= 40.0
44+
packaging >= 17.1
4545
pytest >= 5.3
46+
importlib-metadata>=1;python_version<"3.8"
4647

4748
[options.entry_points]
4849
pytest11 =

test_pytest_rerunfailures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from unittest import mock
44

55
import pytest
6-
from pkg_resources import parse_version
6+
from packaging.version import parse as parse_version
77

88
from pytest_rerunfailures import HAS_PYTEST_HANDLECRASHITEM
99

0 commit comments

Comments
 (0)