Skip to content

Commit a9a1bd5

Browse files
acceptance test and changelog for issue #167
1 parent f9dd60a commit a9a1bd5

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v1.15.5
2+
=======
3+
4+
* fix #167 by correctly respecting preformatted version metadata
5+
from PKG-INFO/EGG-INFO
6+
17
v1.15.4
28
=======
39

testing/conftest.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,18 @@ def commit_testfile(self, reason=None):
5252
self(self.add_command)
5353
self.commit(reason=reason)
5454

55-
@property
56-
def version(self):
55+
def get_version(self, **kw):
5756
__tracebackhide__ = True
5857
from setuptools_scm import get_version
59-
version = get_version(root=str(self.cwd))
58+
version = get_version(root=str(self.cwd), **kw)
6059
print(version)
6160
return version
6261

62+
@property
63+
def version(self):
64+
__tracebackhide__ = True
65+
return self.get_version()
66+
6367

6468
@pytest.yield_fixture(autouse=True)
6569
def debug_mode():

testing/test_basic_api.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def test_version_from_pkginfo(wd):
3030
wd.write('PKG-INFO', 'Version: 0.1')
3131
assert wd.version == '0.1'
3232

33+
# replicate issue 167
34+
assert wd.get_version(version_scheme="1.{0.distance}.0".format) == '0.1'
35+
3336

3437
def assert_root(monkeypatch, expected_root):
3538
"""

0 commit comments

Comments
 (0)