Skip to content

Commit c06b93f

Browse files
committed
Use importlib.metadata in poetry_relax._core
1 parent 39d32b3 commit c06b93f

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

src/poetry_relax/_core.py

+15-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,25 @@
44
import contextlib
55
import functools
66
import re
7+
import sys
78
from copy import copy
89
from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional
910

10-
import pkg_resources
11+
import packaging.version
1112

12-
if pkg_resources.get_distribution("poetry").version.startswith("1.2."):
13+
if sys.version_info < (3, 8): # Python 3.7 support
14+
import pkg_resources
15+
16+
POETRY_VERSION = packaging.version.Version(
17+
pkg_resources.get_distribution("poetry").version
18+
)
19+
else:
20+
import importlib.metadata as importlib_metadata
21+
22+
POETRY_VERSION = packaging.version.Version(importlib_metadata.version("poetry"))
23+
24+
25+
if POETRY_VERSION < packaging.version.Version("1.3.0"):
1326
from poetry.core.semver.version_range import VersionRange
1427
else:
1528
from poetry.core.constraints.version import VersionRange

tests/_fixtures.py

+2-11
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,9 @@
1111
from poetry.console.application import Application as PoetryApplication
1212
from poetry.utils.env import EnvManager, VirtualEnv
1313

14-
from ._utilities import check_paths_relative, tmpchdir
15-
16-
if sys.version_info < (3, 8): # Python 3.7 support
17-
import pkg_resources
14+
from poetry_relax._core import POETRY_VERSION
1815

19-
POETRY_VERSION = packaging.version.Version(
20-
pkg_resources.get_distribution("poetry").version
21-
)
22-
else:
23-
import importlib.metadata as importlib_metadata
24-
25-
POETRY_VERSION = packaging.version.Version(importlib_metadata.version("poetry"))
16+
from ._utilities import check_paths_relative, tmpchdir
2617

2718

2819
@pytest.fixture(scope="session")

0 commit comments

Comments
 (0)