vcs-versioning 2.1.0__tar.gz → 2.1.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/CHANGELOG.md +6 -0
- {vcs_versioning-2.1.0/src/vcs_versioning.egg-info → vcs_versioning-2.1.1}/PKG-INFO +1 -1
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_config.py +0 -1
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_get_version_impl.py +14 -3
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1/src/vcs_versioning.egg-info}/PKG-INFO +1 -1
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_config.py +16 -1
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/LICENSE.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/MANIFEST.in +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/README.md +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/pyproject.toml +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/setup.cfg +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/setup.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/__main__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_discover_vcs.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_git.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_hg.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_hg_git.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_jj.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_backends/_scm_workdir.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_cli/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_cli/_args.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_cli/git_archival_full.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_cli/git_archival_stable.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_compat.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_discover.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_dump_version.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_entrypoints.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_environment.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_exceptions.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_fallback_workdir.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_fallbacks.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_file_finders/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_file_finders/_git.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_file_finders/_hg.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_file_finders/_jj.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_integration.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_integrator_helpers.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_legacy_parse.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_log.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_modify_version.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_node_utils.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_overrides.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_paths.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_project_overrides.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_protocols.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_pyproject_reading.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_requirement_cls.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_run_cmd.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_scm_metadata.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_scm_version.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_test_utils.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_toml.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_types.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_cls.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_fields.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_inference.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_common.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_standard.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_towncrier.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_worktree_discovery.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/overrides.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/py.typed +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/test_api.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/SOURCES.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/dependency_links.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/entry_points.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/requires.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/top_level.txt +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/__init__.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/conftest.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_better_root_errors.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_chain_api.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_compat.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_expect_parse.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_file_finders.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_git.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_hg_git.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_integrator_helpers.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_internal_log_level.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_jj.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_legacy_parse.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_mercurial.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_overrides_api.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_overrides_env_reader.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_project_overrides.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_project_path.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_regressions.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_scm_metadata.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_tag_config.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_version.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_version_scheme_towncrier.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_version_schemes.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_workdir_api.py +0 -0
- {vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/testing_vcs/test_workdir_discovery.py +0 -0
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
<!-- towncrier release notes start -->
|
|
4
4
|
|
|
5
|
+
## 2.1.1 (2026-06-23)
|
|
6
|
+
|
|
7
|
+
### Fixed
|
|
8
|
+
|
|
9
|
+
- Fix spurious ``DeprecationWarning`` for ``tag_regex`` when using default value via ``get_version()``. ([#1434](https://github.com/pypa/setuptools-scm/issues/1434))
|
|
10
|
+
|
|
5
11
|
## 2.1.0 (2026-06-22)
|
|
6
12
|
|
|
7
13
|
### Added
|
|
@@ -342,7 +342,6 @@ class Configuration:
|
|
|
342
342
|
"Cannot specify both 'tag_regex' (deprecated) and "
|
|
343
343
|
"'tag.regex'. Please use only 'tag.regex'."
|
|
344
344
|
)
|
|
345
|
-
# Replace with a new TagConfiguration to avoid mutating shared objects
|
|
346
345
|
self.tag = dataclasses.replace(
|
|
347
346
|
self.tag, regex=_check_tag_regex(tag_regex)
|
|
348
347
|
)
|
|
@@ -10,7 +10,7 @@ from typing import Any, NoReturn
|
|
|
10
10
|
|
|
11
11
|
from . import _config
|
|
12
12
|
from . import _types as _t
|
|
13
|
-
from ._config import Configuration
|
|
13
|
+
from ._config import Configuration, TagConfiguration
|
|
14
14
|
from ._environment import resolve_runtime_env
|
|
15
15
|
|
|
16
16
|
# Backward-compat re-export used by vcs-versioning/setup.py
|
|
@@ -270,7 +270,18 @@ def get_version(
|
|
|
270
270
|
|
|
271
271
|
version_cls = _validate_version_cls(version_cls, normalize)
|
|
272
272
|
del normalize
|
|
273
|
-
|
|
273
|
+
|
|
274
|
+
if tag_regex is _config.DEFAULT_TAG_REGEX:
|
|
275
|
+
tag_config = TagConfiguration()
|
|
276
|
+
else:
|
|
277
|
+
warnings.warn(
|
|
278
|
+
"get_version() parameter 'tag_regex' is deprecated. "
|
|
279
|
+
"Use 'tag.regex' in pyproject.toml or pass a TagConfiguration "
|
|
280
|
+
"via Configuration(tag=...) instead.",
|
|
281
|
+
DeprecationWarning,
|
|
282
|
+
stacklevel=2,
|
|
283
|
+
)
|
|
284
|
+
tag_config = TagConfiguration(regex=parse_tag_regex(tag_regex))
|
|
274
285
|
|
|
275
286
|
scm_config = _config.ScmConfiguration.from_data(data=scm)
|
|
276
287
|
|
|
@@ -286,7 +297,6 @@ def get_version(
|
|
|
286
297
|
version_file=version_file,
|
|
287
298
|
version_file_template=version_file_template,
|
|
288
299
|
relative_to=relative_to,
|
|
289
|
-
tag_regex=tag_regex,
|
|
290
300
|
parentdir_prefix_version=parentdir_prefix_version,
|
|
291
301
|
fallback_version=fallback_version,
|
|
292
302
|
fallback_root=fallback_root,
|
|
@@ -296,6 +306,7 @@ def get_version(
|
|
|
296
306
|
version_cls=version_cls,
|
|
297
307
|
search_parent_directories=search_parent_directories,
|
|
298
308
|
scm=scm_config,
|
|
309
|
+
tag=tag_config,
|
|
299
310
|
_env=_env,
|
|
300
311
|
)
|
|
301
312
|
maybe_version = _get_version(config, force_write_version_files=True)
|
|
@@ -7,7 +7,7 @@ import warnings
|
|
|
7
7
|
|
|
8
8
|
import pytest
|
|
9
9
|
from vcs_versioning import Configuration
|
|
10
|
-
from vcs_versioning._config import TagConfiguration
|
|
10
|
+
from vcs_versioning._config import DEFAULT_TAG_REGEX, TagConfiguration
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
@pytest.mark.parametrize(
|
|
@@ -60,6 +60,21 @@ def test_deprecated_tag_regex_init_var() -> None:
|
|
|
60
60
|
assert conf.tag.regex is tag_regex
|
|
61
61
|
|
|
62
62
|
|
|
63
|
+
@pytest.mark.issue(1434)
|
|
64
|
+
def test_omitting_tag_regex_no_deprecation_warning() -> None:
|
|
65
|
+
"""Omitting tag_regex (None default) should not emit DeprecationWarning."""
|
|
66
|
+
with warnings.catch_warnings():
|
|
67
|
+
warnings.simplefilter("error", DeprecationWarning)
|
|
68
|
+
Configuration()
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
@pytest.mark.issue(1434)
|
|
72
|
+
def test_explicit_default_tag_regex_warns() -> None:
|
|
73
|
+
"""Explicitly passing DEFAULT_TAG_REGEX still warns (deprecated param)."""
|
|
74
|
+
with pytest.warns(DeprecationWarning, match="Use 'tag.regex' instead"):
|
|
75
|
+
Configuration(tag_regex=DEFAULT_TAG_REGEX)
|
|
76
|
+
|
|
77
|
+
|
|
63
78
|
def test_tag_regex_conflict() -> None:
|
|
64
79
|
"""Cannot set both tag_regex= and tag.regex simultaneously."""
|
|
65
80
|
with pytest.raises(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_cli/git_archival_stable.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/__init__.py
RENAMED
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_common.py
RENAMED
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_standard.py
RENAMED
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning/_version_schemes/_towncrier.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{vcs_versioning-2.1.0 → vcs_versioning-2.1.1}/src/vcs_versioning.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|