Skip to content

Commit eba3363

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 3480bed commit eba3363

File tree

8 files changed

+63
-80
lines changed

8 files changed

+63
-80
lines changed

nextgen/vcs-versioning/pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ dynamic = [
3030
]
3131
dependencies = [
3232
]
33-
[project.urls]
34-
Documentation = "https://github.com/unknown/vcs-versioning#readme"
35-
Issues = "https://github.com/unknown/vcs-versioning/issues"
36-
Source = "https://github.com/unknown/vcs-versioning"
33+
urls.Documentation = "https://github.com/unknown/vcs-versioning#readme"
34+
urls.Issues = "https://github.com/unknown/vcs-versioning/issues"
35+
urls.Source = "https://github.com/unknown/vcs-versioning"
3736

3837
[tool.hatch.version]
3938
path = "vcs_versioning/__about__.py"
@@ -48,7 +47,7 @@ cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=vcs_ve
4847
no-cov = "cov --no-cov {args}"
4948

5049
[[tool.hatch.envs.test.matrix]]
51-
python = ["38", "39", "310", "311"]
50+
python = [ "38", "39", "310", "311" ]
5251

5352
[tool.coverage.run]
5453
branch = true

pyproject.toml

Lines changed: 49 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
2-
31
[build-system]
42
build-backend = "_own_version_helper:build_meta"
53
requires = [
64
"setuptools>=61",
7-
'tomli; python_version < "3.11"',
5+
"tomli; python_version<'3.11'",
86
]
97
backend-path = [
108
".",
@@ -17,7 +15,7 @@ description = "the blessed package to manage your versions by scm tags"
1715
readme = "README.md"
1816
license.file = "LICENSE"
1917
authors = [
20-
{name="Ronny Pfannschmidt", email="[email protected]"}
18+
{ name = "Ronny Pfannschmidt", email = "[email protected]" },
2119
]
2220
requires-python = ">=3.8"
2321
classifiers = [
@@ -42,98 +40,84 @@ dynamic = [
4240
dependencies = [
4341
"packaging>=20",
4442
"setuptools",
45-
'tomli>=1; python_version < "3.11"',
46-
'typing-extensions; python_version < "3.10"',
43+
"tomli>=1; python_version<'3.11'",
44+
"typing-extensions; python_version<'3.10'",
4745
]
48-
[project.optional-dependencies]
49-
docs = [
46+
optional-dependencies.docs = [
5047
"entangled-cli~=2.0",
5148
"mkdocs",
5249
"mkdocs-entangled-plugin",
5350
"mkdocs-material",
5451
"mkdocstrings[python]",
5552
"pygments",
5653
]
57-
rich = [
54+
optional-dependencies.rich = [
5855
"rich",
5956
]
60-
test = [
57+
optional-dependencies.test = [
6158
"build",
6259
"pytest",
6360
"rich",
64-
'typing-extensions; python_version < "3.11"',
61+
"typing-extensions; python_version<'3.11'",
6562
"wheel",
6663
]
67-
toml = [
64+
optional-dependencies.toml = [
6865
]
69-
[project.urls]
70-
documentation = "https://setuptools-scm.readthedocs.io/"
71-
repository = "https://github.com/pypa/setuptools_scm/"
72-
[project.entry-points."distutils.setup_keywords"]
73-
use_scm_version = "setuptools_scm._integration.setuptools:version_keyword"
74-
[project.entry-points."pipx.run"]
75-
setuptools_scm = "setuptools_scm._cli:main"
76-
[project.entry-points."setuptools.file_finders"]
77-
setuptools_scm = "setuptools_scm._file_finders:find_files"
78-
[project.entry-points."setuptools.finalize_distribution_options"]
79-
setuptools_scm = "setuptools_scm._integration.setuptools:infer_version"
80-
[project.entry-points."setuptools_scm.files_command"]
81-
".git" = "setuptools_scm._file_finders.git:git_find_files"
82-
".hg" = "setuptools_scm._file_finders.hg:hg_find_files"
83-
[project.entry-points."setuptools_scm.files_command_fallback"]
84-
".git_archival.txt" = "setuptools_scm._file_finders.git:git_archive_find_files"
85-
".hg_archival.txt" = "setuptools_scm._file_finders.hg:hg_archive_find_files"
86-
[project.entry-points."setuptools_scm.local_scheme"]
87-
dirty-tag = "setuptools_scm.version:get_local_dirty_tag"
88-
no-local-version = "setuptools_scm.version:get_no_local_node"
89-
node-and-date = "setuptools_scm.version:get_local_node_and_date"
90-
node-and-timestamp = "setuptools_scm.version:get_local_node_and_timestamp"
91-
[project.entry-points."setuptools_scm.parse_scm"]
92-
".git" = "setuptools_scm.git:parse"
93-
".hg" = "setuptools_scm.hg:parse"
94-
[project.entry-points."setuptools_scm.parse_scm_fallback"]
95-
".git_archival.txt" = "setuptools_scm.git:parse_archival"
96-
".hg_archival.txt" = "setuptools_scm.hg:parse_archival"
97-
PKG-INFO = "setuptools_scm.fallbacks:parse_pkginfo"
98-
"pyproject.toml" = "setuptools_scm.fallbacks:fallback_version"
99-
"setup.py" = "setuptools_scm.fallbacks:fallback_version"
100-
[project.entry-points."setuptools_scm.version_scheme"]
101-
"calver-by-date" = "setuptools_scm.version:calver_by_date"
102-
"guess-next-dev" = "setuptools_scm.version:guess_next_dev_version"
103-
"no-guess-dev" = "setuptools_scm.version:no_guess_dev_version"
104-
"only-version" = "setuptools_scm.version:only_version"
105-
"post-release" = "setuptools_scm.version:postrelease_version"
106-
"python-simplified-semver" = "setuptools_scm.version:simplified_semver_version"
107-
"release-branch-semver" = "setuptools_scm.version:release_branch_semver_version"
66+
urls.documentation = "https://setuptools-scm.readthedocs.io/"
67+
urls.repository = "https://github.com/pypa/setuptools_scm/"
68+
entry-points."distutils.setup_keywords".use_scm_version = "setuptools_scm._integration.setuptools:version_keyword"
69+
entry-points."pipx.run".setuptools_scm = "setuptools_scm._cli:main"
70+
entry-points."setuptools.file_finders".setuptools_scm = "setuptools_scm._file_finders:find_files"
71+
entry-points."setuptools.finalize_distribution_options".setuptools_scm = "setuptools_scm._integration.setuptools:infer_version"
72+
entry-points."setuptools_scm.files_command".".git" = "setuptools_scm._file_finders.git:git_find_files"
73+
entry-points."setuptools_scm.files_command".".hg" = "setuptools_scm._file_finders.hg:hg_find_files"
74+
entry-points."setuptools_scm.files_command_fallback".".git_archival.txt" = "setuptools_scm._file_finders.git:git_archive_find_files"
75+
entry-points."setuptools_scm.files_command_fallback".".hg_archival.txt" = "setuptools_scm._file_finders.hg:hg_archive_find_files"
76+
entry-points."setuptools_scm.local_scheme".dirty-tag = "setuptools_scm.version:get_local_dirty_tag"
77+
entry-points."setuptools_scm.local_scheme".no-local-version = "setuptools_scm.version:get_no_local_node"
78+
entry-points."setuptools_scm.local_scheme".node-and-date = "setuptools_scm.version:get_local_node_and_date"
79+
entry-points."setuptools_scm.local_scheme".node-and-timestamp = "setuptools_scm.version:get_local_node_and_timestamp"
80+
entry-points."setuptools_scm.parse_scm".".git" = "setuptools_scm.git:parse"
81+
entry-points."setuptools_scm.parse_scm".".hg" = "setuptools_scm.hg:parse"
82+
entry-points."setuptools_scm.parse_scm_fallback".".git_archival.txt" = "setuptools_scm.git:parse_archival"
83+
entry-points."setuptools_scm.parse_scm_fallback".".hg_archival.txt" = "setuptools_scm.hg:parse_archival"
84+
entry-points."setuptools_scm.parse_scm_fallback".PKG-INFO = "setuptools_scm.fallbacks:parse_pkginfo"
85+
entry-points."setuptools_scm.parse_scm_fallback"."pyproject.toml" = "setuptools_scm.fallbacks:fallback_version"
86+
entry-points."setuptools_scm.parse_scm_fallback"."setup.py" = "setuptools_scm.fallbacks:fallback_version"
87+
entry-points."setuptools_scm.version_scheme"."calver-by-date" = "setuptools_scm.version:calver_by_date"
88+
entry-points."setuptools_scm.version_scheme"."guess-next-dev" = "setuptools_scm.version:guess_next_dev_version"
89+
entry-points."setuptools_scm.version_scheme"."no-guess-dev" = "setuptools_scm.version:no_guess_dev_version"
90+
entry-points."setuptools_scm.version_scheme"."only-version" = "setuptools_scm.version:only_version"
91+
entry-points."setuptools_scm.version_scheme"."post-release" = "setuptools_scm.version:postrelease_version"
92+
entry-points."setuptools_scm.version_scheme"."python-simplified-semver" = "setuptools_scm.version:simplified_semver_version"
93+
entry-points."setuptools_scm.version_scheme"."release-branch-semver" = "setuptools_scm.version:release_branch_semver_version"
10894

10995
[tool.setuptools.packages.find]
110-
where = ["src"]
96+
where = [ "src" ]
11197
namespaces = false
11298

11399
[tool.setuptools.dynamic]
114-
version = { attr = "_own_version_helper.version"}
100+
version = { attr = "_own_version_helper.version" }
115101

116102
[tool.setuptools_scm]
117103

118104
[tool.ruff]
119-
src = ["src"]
105+
src = [ "src" ]
120106
fix = true
121-
lint.select = ["E", "F", "B", "UP", "YTT", "C", "DTZ", "PYI", "PT", "I", "FURB", "RUF"]
122-
lint.ignore = ["B028"]
107+
lint.select = [ "B", "C", "DTZ", "E", "F", "FURB", "I", "PT", "PYI", "RUF", "UP", "YTT" ]
108+
lint.ignore = [ "B028" ]
109+
lint.isort.force-single-line = true
110+
lint.isort.from-first = false
111+
lint.isort.lines-between-types = 1
112+
lint.isort.order-by-type = true
123113
lint.preview = true
124114

125-
[tool.ruff.lint.isort]
126-
force-single-line = true
127-
from-first = false
128-
lines-between-types = 1
129-
order-by-type = true
130-
131115
[tool.repo-review]
132-
ignore = ["PP305", "GH103", "GH212", "MY100", "PC111", "PC160", "PC170", "PC180", "PC901"]
116+
ignore = [ "PP305", "GH103", "GH212", "MY100", "PC111", "PC160", "PC170", "PC180", "PC901" ]
133117

134118
[tool.pytest.ini_options]
135119
minversion = "7"
136-
testpaths = ["testing"]
120+
testpaths = [ "testing" ]
137121
filterwarnings = [
138122
"error",
139123
"ignore:.*tool\\.setuptools_scm.*",
@@ -142,7 +126,7 @@ filterwarnings = [
142126
log_level = "debug"
143127
log_cli_level = "info"
144128
# disable unraisable until investigated
145-
addopts = ["-ra", "--strict-config", "--strict-markers", "-p", "no:unraisableexception"]
129+
addopts = [ "-ra", "--strict-config", "--strict-markers", "-p", "no:unraisableexception" ]
146130
markers = [
147131
"issue(id): reference to github issue",
148132
"skip_commit: allows to skip committing in the helpers",

testing/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ def debug_mode() -> Iterator[DebugMode]:
7979
yield debug_mode
8080

8181

82-
@pytest.fixture()
82+
@pytest.fixture
8383
def wd(tmp_path: Path) -> WorkDir:
8484
target_wd = tmp_path.resolve() / "wd"
8585
target_wd.mkdir()
8686
return WorkDir(target_wd)
8787

8888

89-
@pytest.fixture()
89+
@pytest.fixture
9090
def repositories_hg_git(tmp_path: Path) -> tuple[WorkDir, WorkDir]:
9191
tmp_path = tmp_path.resolve()
9292
path_git = tmp_path / "repo_git"

testing/test_file_finder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def test_symlink_not_in_scm_while_target_is(inwd: WorkDir) -> None:
212212

213213

214214
@pytest.mark.issue(587)
215-
@pytest.mark.skip_commit()
215+
@pytest.mark.skip_commit
216216
def test_not_commited(inwd: WorkDir) -> None:
217217
assert find_files() == []
218218

testing/test_git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def test_git_worktree_support(wd: WorkDir, tmp_path: Path) -> None:
307307
assert str(worktree) in res.stdout
308308

309309

310-
@pytest.fixture()
310+
@pytest.fixture
311311
def shallow_wd(wd: WorkDir, tmp_path: Path) -> Path:
312312
wd.commit_testfile()
313313
wd.commit_testfile()
@@ -515,7 +515,7 @@ def test_git_getdate_git_2_45_0_plus(
515515
assert git_wd.get_head_date() == date(2024, 4, 30)
516516

517517

518-
@pytest.fixture()
518+
@pytest.fixture
519519
def signed_commit_wd(monkeypatch: pytest.MonkeyPatch, wd: WorkDir) -> WorkDir:
520520
if not has_command("gpg", args=["--version"], warn=False):
521521
pytest.skip("gpg executable not found")

testing/test_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
c = Configuration()
2424

2525

26-
@pytest.fixture()
26+
@pytest.fixture
2727
def wd(wd: WorkDir) -> WorkDir:
2828
wd("git init")
2929
wd("git config user.email [email protected]")

testing/test_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_main() -> None:
2020
exec(code, ns)
2121

2222

23-
@pytest.fixture()
23+
@pytest.fixture
2424
def repo(wd: WorkDir) -> WorkDir:
2525
wd("git init")
2626
wd("git config user.email user@host")

testing/test_mercurial.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
)
2222

2323

24-
@pytest.fixture()
24+
@pytest.fixture
2525
def wd(wd: WorkDir) -> WorkDir:
2626
wd("hg init")
2727
wd.add_command = "hg add ."
@@ -153,15 +153,15 @@ def test_parse_no_worktree(tmp_path: Path) -> None:
153153
assert ret is None
154154

155155

156-
@pytest.fixture()
156+
@pytest.fixture
157157
def version_1_0(wd: WorkDir) -> WorkDir:
158158
wd("hg branch default")
159159
wd.commit_testfile()
160160
wd('hg tag 1.0.0 -u test -d "0 0"')
161161
return wd
162162

163163

164-
@pytest.fixture()
164+
@pytest.fixture
165165
def pre_merge_commit_after_tag(version_1_0: WorkDir) -> WorkDir:
166166
wd = version_1_0
167167
wd("hg branch testbranch")

0 commit comments

Comments
 (0)