Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite2e928f

Browse files
authored
Merge branch 'master' into issue-1119
2 parents4e23d00 +974de65 commite2e928f

File tree

9 files changed

+110
-83
lines changed

9 files changed

+110
-83
lines changed

‎commitizen/changelog_formats/__init__.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from __future__importannotations
22

3+
importsys
34
fromtypingimportClassVar,Protocol
45

5-
importimportlib_metadataasmetadata
6+
ifsys.version_info>= (3,10):
7+
fromimportlibimportmetadata
8+
else:
9+
importimportlib_metadataasmetadata
610

711
fromcommitizen.changelogimportMetadata
812
fromcommitizen.config.base_configimportBaseConfig

‎commitizen/cz/__init__.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
importimportlib
44
importpkgutil
5+
importsys
56
importwarnings
67
fromtypingimportIterable
78

8-
importimportlib_metadataasmetadata
9+
ifsys.version_info>= (3,10):
10+
fromimportlibimportmetadata
11+
else:
12+
importimportlib_metadataasmetadata
913

1014
fromcommitizen.cz.baseimportBaseCommitizen
1115

‎commitizen/providers/__init__.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
from __future__importannotations
22

3+
importsys
34
fromtypingimportcast
45

5-
importimportlib_metadataasmetadata
6+
ifsys.version_info>= (3,10):
7+
fromimportlibimportmetadata
8+
else:
9+
importimportlib_metadataasmetadata
610

711
fromcommitizen.config.base_configimportBaseConfig
812
fromcommitizen.exceptionsimportVersionProviderUnknown

‎commitizen/version_schemes.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
runtime_checkable,
1616
)
1717

18-
importimportlib_metadataasmetadata
18+
ifsys.version_info>= (3,10):
19+
fromimportlibimportmetadata
20+
else:
21+
importimportlib_metadataasmetadata
22+
1923
frompackaging.versionimportInvalidVersion# noqa: F401: Rexpose the common exception
2024
frompackaging.versionimportVersionas_BaseVersion
2125

‎poetry.lock‎

Lines changed: 72 additions & 71 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ packaging = ">=19"
4747
tomlkit =">=0.5.3,<1.0.0"
4848
jinja2 =">=2.10.3"
4949
pyyaml =">=3.08"
50-
argcomplete =">=1.12.1,<3.4"
50+
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 =">=8.0.0,<9",python ="<3.10"}
5555

5656
[tool.poetry.group.dev.dependencies]
5757
# dev tool
@@ -64,7 +64,7 @@ pytest-regressions = "^2.4.0"
6464
pytest-freezer ="^0.4.6"
6565
pytest-xdist ="^3.1.0"
6666
# linter
67-
ruff =">=0.1.6,<0.5.0"
67+
ruff =">=0.5.0,<0.6.0"
6868
pre-commit =">=2.18,<4.0"
6969
mypy ="^1.4"
7070
types-PyYAML =">=5.4.3,<7.0.0"

‎tests/test_cli.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_commitizen_excepthook(capsys):
8888
withpytest.raises(SystemExit)asexcinfo:
8989
cli.commitizen_excepthook(NotAGitProjectError,NotAGitProjectError(),"")
9090

91-
assertexcinfo.type==SystemExit
91+
assertexcinfo.typeisSystemExit
9292
assertexcinfo.value.code==NotAGitProjectError.exit_code
9393

9494

@@ -101,7 +101,7 @@ def test_commitizen_debug_excepthook(capsys):
101101
debug=True,
102102
)
103103

104-
assertexcinfo.type==SystemExit
104+
assertexcinfo.typeisSystemExit
105105
assertexcinfo.value.code==NotAGitProjectError.exit_code
106106
assert"NotAGitProjectError"instr(excinfo.traceback[0])
107107

@@ -132,7 +132,7 @@ def test_commitizen_excepthook_no_raises(capsys):
132132
no_raise=[NotAGitProjectError.exit_code],
133133
)
134134

135-
assertexcinfo.type==SystemExit
135+
assertexcinfo.typeisSystemExit
136136
assertexcinfo.value.code==0
137137

138138

‎tests/test_factory.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
importsys
22
fromtextwrapimportdedent
33

4-
importimportlib_metadataasmetadata
4+
ifsys.version_info>= (3,10):
5+
fromimportlibimportmetadata
6+
else:
7+
importimportlib_metadataasmetadata
8+
59
importpytest
610

711
fromcommitizenimportBaseCommitizen,defaults,factory

‎tests/test_version_schemes.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
from __future__importannotations
22

3-
importimportlib_metadataasmetadata
3+
importsys
4+
5+
ifsys.version_info>= (3,10):
6+
fromimportlibimportmetadata
7+
else:
8+
importimportlib_metadataasmetadata
9+
410
importpytest
511
frompytest_mockimportMockerFixture
612

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2026 Movatter.jp