Skip to content

build(deps): remove importlib_metadata for Python >=3.10 #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion commitizen/changelog_formats/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from __future__ import annotations

import sys
from typing import ClassVar, Protocol

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

from commitizen.changelog import Metadata
from commitizen.config.base_config import BaseConfig
Expand Down
6 changes: 5 additions & 1 deletion commitizen/cz/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import importlib
import pkgutil
import sys
import warnings
from typing import Iterable

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

from commitizen.cz.base import BaseCommitizen

Expand Down
6 changes: 5 additions & 1 deletion commitizen/providers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from __future__ import annotations

import sys
from typing import cast

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

from commitizen.config.base_config import BaseConfig
from commitizen.exceptions import VersionProviderUnknown
Expand Down
6 changes: 5 additions & 1 deletion commitizen/version_schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
runtime_checkable,
)

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

from packaging.version import InvalidVersion # noqa: F401: Rexpose the common exception
from packaging.version import Version as _BaseVersion

Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ argcomplete = ">=1.12.1,<3.5"
typing-extensions = { version = "^4.0.1", python = "<3.8" }
charset-normalizer = ">=2.1.0,<4"
# Use the Python 3.11 and 3.12 compatible API: https://github.com/python/importlib_metadata#compatibility
importlib_metadata = { version = ">=4.13,<8"}
importlib_metadata = { version = ">=4.13,<8", python = "<3.10"}

[tool.poetry.group.dev.dependencies]
# dev tool
Expand Down
6 changes: 5 additions & 1 deletion tests/test_factory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import sys
from textwrap import dedent

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

import pytest

from commitizen import BaseCommitizen, defaults, factory
Expand Down
8 changes: 7 additions & 1 deletion tests/test_version_schemes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
from __future__ import annotations

import importlib_metadata as metadata
import sys

if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata

import pytest
from pytest_mock import MockerFixture

Expand Down
Loading