Skip to content

Commit 927cbcb

Browse files
jakob-kellerLee-W
authored andcommitted
build(deps): remove importlib_metadata for Python >=3.10
1 parent 363d4e6 commit 927cbcb

File tree

8 files changed

+34
-8
lines changed

8 files changed

+34
-8
lines changed

commitizen/changelog_formats/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from __future__ import annotations
22

3+
import sys
34
from typing import ClassVar, Protocol
45

5-
import importlib_metadata as metadata
6+
if sys.version_info >= (3, 10):
7+
from importlib import metadata
8+
else:
9+
import importlib_metadata as metadata
610

711
from commitizen.changelog import Metadata
812
from commitizen.config.base_config import BaseConfig

commitizen/cz/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
import importlib
44
import pkgutil
5+
import sys
56
import warnings
67
from typing import Iterable
78

8-
import importlib_metadata as metadata
9+
if sys.version_info >= (3, 10):
10+
from importlib import metadata
11+
else:
12+
import importlib_metadata as metadata
913

1014
from commitizen.cz.base import BaseCommitizen
1115

commitizen/providers/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from __future__ import annotations
22

3+
import sys
34
from typing import cast
45

5-
import importlib_metadata as metadata
6+
if sys.version_info >= (3, 10):
7+
from importlib import metadata
8+
else:
9+
import importlib_metadata as metadata
610

711
from commitizen.config.base_config import BaseConfig
812
from commitizen.exceptions import VersionProviderUnknown

commitizen/version_schemes.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
runtime_checkable,
1616
)
1717

18-
import importlib_metadata as metadata
18+
if sys.version_info >= (3, 10):
19+
from importlib import metadata
20+
else:
21+
import importlib_metadata as metadata
22+
1923
from packaging.version import InvalidVersion # noqa: F401: Rexpose the common exception
2024
from packaging.version import Version as _BaseVersion
2125

poetry.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ argcomplete = ">=1.12.1,<3.5"
5151
typing-extensions = { version = "^4.0.1", python = "<3.8" }
5252
charset-normalizer = ">=2.1.0,<4"
5353
# Use the Python 3.11 and 3.12 compatible API: https://github.com/python/importlib_metadata#compatibility
54-
importlib_metadata = { version = ">=4.13,<8"}
54+
importlib_metadata = { version = ">=4.13,<8", python = "<3.10"}
5555

5656
[tool.poetry.group.dev.dependencies]
5757
# dev tool

tests/test_factory.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import sys
22
from textwrap import dedent
33

4-
import importlib_metadata as metadata
4+
if sys.version_info >= (3, 10):
5+
from importlib import metadata
6+
else:
7+
import importlib_metadata as metadata
8+
59
import pytest
610

711
from commitizen import BaseCommitizen, defaults, factory

tests/test_version_schemes.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
from __future__ import annotations
22

3-
import importlib_metadata as metadata
3+
import sys
4+
5+
if sys.version_info >= (3, 10):
6+
from importlib import metadata
7+
else:
8+
import importlib_metadata as metadata
9+
410
import pytest
511
from pytest_mock import MockerFixture
612

0 commit comments

Comments
 (0)