Skip to content

Commit 77deaba

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

File tree

13 files changed

+80
-95
lines changed

13 files changed

+80
-95
lines changed

nextgen/vcs-versioning/pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ classifiers = [
2424
"Programming Language :: Python :: 3.10",
2525
"Programming Language :: Python :: 3.11",
2626
"Programming Language :: Python :: 3.12",
27+
"Programming Language :: Python :: 3.13",
2728
]
2829
dynamic = [
2930
"version",
3031
]
3132
dependencies = [
3233
]
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"
34+
urls.Documentation = "https://github.com/unknown/vcs-versioning#readme"
35+
urls.Issues = "https://github.com/unknown/vcs-versioning/issues"
36+
urls.Source = "https://github.com/unknown/vcs-versioning"
3737

3838
[tool.hatch.version]
3939
path = "vcs_versioning/__about__.py"
@@ -48,7 +48,7 @@ cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=vcs_ve
4848
no-cov = "cov --no-cov {args}"
4949

5050
[[tool.hatch.envs.test.matrix]]
51-
python = ["38", "39", "310", "311"]
51+
python = [ "38", "39", "310", "311" ]
5252

5353
[tool.coverage.run]
5454
branch = true

pyproject.toml

Lines changed: 50 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 = [
@@ -31,6 +29,7 @@ classifiers = [
3129
"Programming Language :: Python :: 3.10",
3230
"Programming Language :: Python :: 3.11",
3331
"Programming Language :: Python :: 3.12",
32+
"Programming Language :: Python :: 3.13",
3433
"Topic :: Software Development :: Libraries",
3534
"Topic :: Software Development :: Version Control",
3635
"Topic :: System :: Software Distribution",
@@ -42,98 +41,84 @@ dynamic = [
4241
dependencies = [
4342
"packaging>=20",
4443
"setuptools",
45-
'tomli>=1; python_version < "3.11"',
46-
'typing-extensions; python_version < "3.10"',
44+
"tomli>=1; python_version<'3.11'",
45+
"typing-extensions; python_version<'3.10'",
4746
]
48-
[project.optional-dependencies]
49-
docs = [
47+
optional-dependencies.docs = [
5048
"entangled-cli~=2.0",
5149
"mkdocs",
5250
"mkdocs-entangled-plugin",
5351
"mkdocs-material",
5452
"mkdocstrings[python]",
5553
"pygments",
5654
]
57-
rich = [
55+
optional-dependencies.rich = [
5856
"rich",
5957
]
60-
test = [
58+
optional-dependencies.test = [
6159
"build",
6260
"pytest",
6361
"rich",
64-
'typing-extensions; python_version < "3.11"',
62+
"typing-extensions; python_version<'3.11'",
6563
"wheel",
6664
]
67-
toml = [
65+
optional-dependencies.toml = [
6866
]
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"
67+
urls.documentation = "https://setuptools-scm.readthedocs.io/"
68+
urls.repository = "https://github.com/pypa/setuptools-scm/"
69+
entry-points."distutils.setup_keywords".use_scm_version = "setuptools_scm._integration.setuptools:version_keyword"
70+
entry-points."pipx.run".setuptools_scm = "setuptools_scm._cli:main"
71+
entry-points."setuptools.file_finders".setuptools_scm = "setuptools_scm._file_finders:find_files"
72+
entry-points."setuptools.finalize_distribution_options".setuptools_scm = "setuptools_scm._integration.setuptools:infer_version"
73+
entry-points."setuptools_scm.files_command".".git" = "setuptools_scm._file_finders.git:git_find_files"
74+
entry-points."setuptools_scm.files_command".".hg" = "setuptools_scm._file_finders.hg:hg_find_files"
75+
entry-points."setuptools_scm.files_command_fallback".".git_archival.txt" = "setuptools_scm._file_finders.git:git_archive_find_files"
76+
entry-points."setuptools_scm.files_command_fallback".".hg_archival.txt" = "setuptools_scm._file_finders.hg:hg_archive_find_files"
77+
entry-points."setuptools_scm.local_scheme".dirty-tag = "setuptools_scm.version:get_local_dirty_tag"
78+
entry-points."setuptools_scm.local_scheme".no-local-version = "setuptools_scm.version:get_no_local_node"
79+
entry-points."setuptools_scm.local_scheme".node-and-date = "setuptools_scm.version:get_local_node_and_date"
80+
entry-points."setuptools_scm.local_scheme".node-and-timestamp = "setuptools_scm.version:get_local_node_and_timestamp"
81+
entry-points."setuptools_scm.parse_scm".".git" = "setuptools_scm.git:parse"
82+
entry-points."setuptools_scm.parse_scm".".hg" = "setuptools_scm.hg:parse"
83+
entry-points."setuptools_scm.parse_scm_fallback".".git_archival.txt" = "setuptools_scm.git:parse_archival"
84+
entry-points."setuptools_scm.parse_scm_fallback".".hg_archival.txt" = "setuptools_scm.hg:parse_archival"
85+
entry-points."setuptools_scm.parse_scm_fallback".PKG-INFO = "setuptools_scm.fallbacks:parse_pkginfo"
86+
entry-points."setuptools_scm.parse_scm_fallback"."pyproject.toml" = "setuptools_scm.fallbacks:fallback_version"
87+
entry-points."setuptools_scm.parse_scm_fallback"."setup.py" = "setuptools_scm.fallbacks:fallback_version"
88+
entry-points."setuptools_scm.version_scheme"."calver-by-date" = "setuptools_scm.version:calver_by_date"
89+
entry-points."setuptools_scm.version_scheme"."guess-next-dev" = "setuptools_scm.version:guess_next_dev_version"
90+
entry-points."setuptools_scm.version_scheme"."no-guess-dev" = "setuptools_scm.version:no_guess_dev_version"
91+
entry-points."setuptools_scm.version_scheme"."only-version" = "setuptools_scm.version:only_version"
92+
entry-points."setuptools_scm.version_scheme"."post-release" = "setuptools_scm.version:postrelease_version"
93+
entry-points."setuptools_scm.version_scheme"."python-simplified-semver" = "setuptools_scm.version:simplified_semver_version"
94+
entry-points."setuptools_scm.version_scheme"."release-branch-semver" = "setuptools_scm.version:release_branch_semver_version"
10895

10996
[tool.setuptools.packages.find]
110-
where = ["src"]
97+
where = [ "src" ]
11198
namespaces = false
11299

113100
[tool.setuptools.dynamic]
114-
version = { attr = "_own_version_helper.version"}
101+
version = { attr = "_own_version_helper.version" }
115102

116103
[tool.setuptools_scm]
117104

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

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-
131116
[tool.repo-review]
132-
ignore = ["PP305", "GH103", "GH212", "MY100", "PC111", "PC160", "PC170", "PC180", "PC901"]
117+
ignore = [ "PP305", "GH103", "GH212", "MY100", "PC111", "PC160", "PC170", "PC180", "PC901" ]
133118

134119
[tool.pytest.ini_options]
135120
minversion = "7"
136-
testpaths = ["testing"]
121+
testpaths = [ "testing" ]
137122
filterwarnings = [
138123
"error",
139124
"ignore:.*tool\\.setuptools_scm.*",
@@ -142,7 +127,7 @@ filterwarnings = [
142127
log_level = "debug"
143128
log_cli_level = "info"
144129
# disable unraisable until investigated
145-
addopts = ["-ra", "--strict-config", "--strict-markers", "-p", "no:unraisableexception"]
130+
addopts = [ "-ra", "--strict-config", "--strict-markers", "-p", "no:unraisableexception" ]
146131
markers = [
147132
"issue(id): reference to github issue",
148133
"skip_commit: allows to skip committing in the helpers",

src/setuptools_scm/_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def from_file(
115115
cls,
116116
name: str | os.PathLike[str] = "pyproject.toml",
117117
dist_name: str | None = None,
118-
_require_section: bool = True,
118+
require_section: bool = True,
119119
**kwargs: Any,
120120
) -> Configuration:
121121
"""
@@ -125,7 +125,7 @@ def from_file(
125125
not contain the [tool.setuptools_scm] section.
126126
"""
127127

128-
pyproject_data = _read_pyproject(Path(name), require_section=_require_section)
128+
pyproject_data = _read_pyproject(Path(name), require_section=require_section)
129129
args = _get_args_for_pyproject(pyproject_data, dist_name, kwargs)
130130

131131
args.update(read_toml_overrides(args["dist_name"]))

src/setuptools_scm/_entrypoints.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ def _get_from_object_reference_str(path: str, group: str) -> Any | None:
8888
def _iter_version_schemes(
8989
entrypoint: str,
9090
scheme_value: _t.VERSION_SCHEMES,
91-
_memo: set[object] | None = None,
91+
memo: set[object] | None = None,
9292
) -> Iterator[Callable[[version.ScmVersion], str]]:
93-
if _memo is None:
94-
_memo = set()
93+
if memo is None:
94+
memo = set()
9595
if isinstance(scheme_value, str):
9696
scheme_value = cast(
9797
"_t.VERSION_SCHEMES",
@@ -101,9 +101,9 @@ def _iter_version_schemes(
101101

102102
if isinstance(scheme_value, (list, tuple)):
103103
for variant in scheme_value:
104-
if variant not in _memo:
105-
_memo.add(variant)
106-
yield from _iter_version_schemes(entrypoint, variant, _memo=_memo)
104+
if variant not in memo:
105+
memo.add(variant)
106+
yield from _iter_version_schemes(entrypoint, variant, _memo=memo)
107107
elif callable(scheme_value):
108108
yield scheme_value
109109

src/setuptools_scm/_integration/setuptools.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ def read_dist_name_from_setup_cfg(
2626
return dist_name
2727

2828

29-
def _warn_on_old_setuptools(_version: str = setuptools.__version__) -> None:
30-
if int(_version.split(".")[0]) < 61:
29+
def _warn_on_old_setuptools(version: str = setuptools.__version__) -> None:
30+
if int(version.split(".")[0]) < 61:
3131
warnings.warn(
3232
RuntimeWarning(
3333
f"""
34-
ERROR: setuptools=={_version} is used in combination with setuptools-scm>=8.x
34+
ERROR: setuptools=={version} is used in combination with setuptools-scm>=8.x
3535
3636
Your build configuration is incomplete and previously worked by accident!
3737
setuptools-scm requires setuptools>=61

src/setuptools_scm/_log.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def make_default_handler() -> logging.Handler:
4949
log.addHandler(_default_handler)
5050

5151

52-
def _default_log_level(_env: Mapping[str, str] = os.environ) -> int:
53-
val: str | None = _env.get("SETUPTOOLS_SCM_DEBUG")
52+
def _default_log_level(env: Mapping[str, str] = os.environ) -> int:
53+
val: str | None = env.get("SETUPTOOLS_SCM_DEBUG")
5454
return logging.WARN if val is None else logging.DEBUG
5555

5656

src/setuptools_scm/git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ def fetch_shallow(self) -> None:
145145
run_git(["fetch", "--unshallow"], self.path, check=True, timeout=240)
146146

147147
def node(self) -> str | None:
148-
_unsafe_short_node = operator.itemgetter(slice(7))
148+
unsafe_short_node = operator.itemgetter(slice(7))
149149

150150
return run_git(
151151
["rev-parse", "--verify", "--quiet", "HEAD"], self.path
152152
).parse_success(
153-
parse=_unsafe_short_node,
153+
parse=unsafe_short_node,
154154
)
155155

156156
def count_all_nodes(self) -> int:

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")

0 commit comments

Comments
 (0)