Skip to content

Commit b72e868

Browse files
fix unintended missing parameters
1 parent 20e8a9e commit b72e868

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

testing/test_functions.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
format_version,
99
tag_to_version,
1010
)
11+
12+
from setuptools_scm.config import Configuration
1113
from setuptools_scm.utils import has_command
1214

1315
PY3 = sys.version_info > (2,)
@@ -33,12 +35,14 @@ def test_next_tag(tag, expected):
3335
assert guess_next_version(version) == expected
3436

3537

38+
c = Configuration()
39+
3640
VERSIONS = {
37-
"exact": meta("1.1", distance=None, dirty=False),
38-
"zerodistance": meta("1.1", distance=0, dirty=False),
39-
"dirty": meta("1.1", distance=None, dirty=True),
40-
"distance": meta("1.1", distance=3, dirty=False),
41-
"distancedirty": meta("1.1", distance=3, dirty=True),
41+
"exact": meta("1.1", distance=None, dirty=False, config=c),
42+
"zerodistance": meta("1.1", distance=0, dirty=False, config=c),
43+
"dirty": meta("1.1", distance=None, dirty=True, config=c),
44+
"distance": meta("1.1", distance=3, dirty=False, config=c),
45+
"distancedirty": meta("1.1", distance=3, dirty=True, config=c),
4246
}
4347

4448

testing/test_version.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,36 @@
33
from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions
44

55

6+
c = Configuration()
7+
8+
69
@pytest.mark.parametrize(
710
"version, expected_next",
811
[
9-
pytest.param(meta("1.0.0"), "1.0.0", id="exact"),
10-
pytest.param(meta("1.0"), "1.0.0", id="short_tag"),
12+
pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"),
13+
pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"),
1114
pytest.param(
12-
meta("1.0.0", distance=2, branch="default"),
15+
meta("1.0.0", distance=2, branch="default", config=c),
1316
"1.0.1.dev2",
1417
id="normal_branch",
1518
),
1619
pytest.param(
17-
meta("1.0", distance=2, branch="default"),
20+
meta("1.0", distance=2, branch="default", config=c),
1821
"1.0.1.dev2",
1922
id="normal_branch_short_tag",
2023
),
2124
pytest.param(
22-
meta("1.0.0", distance=2, branch="feature"),
25+
meta("1.0.0", distance=2, branch="feature", config=c),
2326
"1.1.0.dev2",
2427
id="feature_branch",
2528
),
2629
pytest.param(
27-
meta("1.0", distance=2, branch="feature"),
30+
meta("1.0", distance=2, branch="feature", config=c),
2831
"1.1.0.dev2",
2932
id="feature_branch_short_tag",
3033
),
3134
pytest.param(
32-
meta("1.0.0", distance=2, branch="features/test"),
35+
meta("1.0.0", distance=2, branch="features/test", config=c),
3336
"1.1.0.dev2",
3437
id="feature_in_branch",
3538
),

0 commit comments

Comments
 (0)