Merge branch 'master' into issue-1119

Author: paduszyk

commitizen/changelog_formats/__init__.py

@@ -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

commitizen/cz/__init__.py

@@ -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
 

commitizen/providers/__init__.py

@@ -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

commitizen/version_schemes.py

@@ -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
 

poetry.lock

@@ -47,11 +47,11 @@ packaging = ">=19"
 tomlkit = ">=0.5.3,<1.0.0"
 jinja2 = ">=2.10.3"
 pyyaml = ">=3.08"
-argcomplete = ">=1.12.1,<3.4"
+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 = ">=8.0.0,<9", python = "<3.10"}
 
 [tool.poetry.group.dev.dependencies]
 # dev tool
@@ -64,7 +64,7 @@ pytest-regressions = "^2.4.0"
 pytest-freezer = "^0.4.6"
 pytest-xdist = "^3.1.0"
 # linter
-ruff = ">=0.1.6,<0.5.0"
+ruff = ">=0.5.0,<0.6.0"
 pre-commit = ">=2.18,<4.0"
 mypy = "^1.4"
 types-PyYAML = ">=5.4.3,<7.0.0"

pyproject.toml

@@ -88,7 +88,7 @@ def test_commitizen_excepthook(capsys):
     with pytest.raises(SystemExit) as excinfo:
         cli.commitizen_excepthook(NotAGitProjectError, NotAGitProjectError(), "")
 
-    assert excinfo.type == SystemExit
+    assert excinfo.type is SystemExit
     assert excinfo.value.code == NotAGitProjectError.exit_code
 
 
@@ -101,7 +101,7 @@ def test_commitizen_debug_excepthook(capsys):
             debug=True,
         )
 
-    assert excinfo.type == SystemExit
+    assert excinfo.type is SystemExit
     assert excinfo.value.code == NotAGitProjectError.exit_code
     assert "NotAGitProjectError" in str(excinfo.traceback[0])
 
@@ -132,7 +132,7 @@ def test_commitizen_excepthook_no_raises(capsys):
             no_raise=[NotAGitProjectError.exit_code],
         )
 
-    assert excinfo.type == SystemExit
+    assert excinfo.type is SystemExit
     assert excinfo.value.code == 0
 
 

tests/test_cli.py

@@ -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

tests/test_factory.py

@@ -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