Skip to content

Commit c5aed67

Browse files
pabs3Michael Howitz
authored andcommitted
Turn PYTEST_GTE_* into one-liners
Done by importing only the needed definitions from pkg_resources, adjust all the other uses of pkg_resources to this style too.
1 parent 387218b commit c5aed67

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

pytest_rerunfailures.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import traceback
77
import warnings
88

9-
import pkg_resources
109
import pytest
1110
from _pytest.outcomes import fail
1211
from _pytest.runner import runtestprotocol
12+
from pkg_resources import DistributionNotFound
13+
from pkg_resources import get_distribution
14+
from pkg_resources import parse_version
1315

1416
HAS_RESULTLOG = False
1517

@@ -22,13 +24,9 @@
2224
pass
2325

2426

25-
PYTEST_GTE_54 = pkg_resources.parse_version(
26-
pytest.__version__
27-
) >= pkg_resources.parse_version("5.4")
27+
PYTEST_GTE_54 = parse_version(pytest.__version__) >= parse_version("5.4")
2828

29-
PYTEST_GTE_63 = pkg_resources.parse_version(
30-
pytest.__version__
31-
) >= pkg_resources.parse_version("6.3.0.dev")
29+
PYTEST_GTE_63 = parse_version(pytest.__version__) >= parse_version("6.3.0.dev")
3230

3331

3432
def works_with_current_xdist():
@@ -41,9 +39,9 @@ def works_with_current_xdist():
4139
4240
"""
4341
try:
44-
d = pkg_resources.get_distribution("pytest-xdist")
45-
return d.parsed_version >= pkg_resources.parse_version("1.20")
46-
except pkg_resources.DistributionNotFound:
42+
d = get_distribution("pytest-xdist")
43+
return d.parsed_version >= parse_version("1.20")
44+
except DistributionNotFound:
4745
return None
4846

4947

test_pytest_rerunfailures.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
import time
33
from unittest import mock
44

5-
import pkg_resources
65
import pytest
6+
from pkg_resources import parse_version
77

88

99
pytest_plugins = "pytester"
1010

11-
PYTEST_GTE_60 = pkg_resources.parse_version(
12-
pytest.__version__
13-
) >= pkg_resources.parse_version("6.0")
11+
PYTEST_GTE_60 = parse_version(pytest.__version__) >= parse_version("6.0")
1412

15-
PYTEST_GTE_61 = pkg_resources.parse_version(
16-
pytest.__version__
17-
) >= pkg_resources.parse_version("6.1")
13+
PYTEST_GTE_61 = parse_version(pytest.__version__) >= parse_version("6.1")
1814

1915

2016
def temporary_failure(count=1):

0 commit comments

Comments
 (0)