Skip to content

Commit f8a0b2a

Browse files
authored
Fix versioneer to get accurate version numbers (#198)
The update to versioneer in #114 resulted in us not getting versions from git. This is because we weren't specifying the tag_prefix appropriately, and this broke newer versions of versioneer. Fix and add a basic unittest that would catch issues like this in the future
1 parent 0ded355 commit f8a0b2a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

merlin/systems/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def get_config():
4242
cfg = VersioneerConfig()
4343
cfg.VCS = "git"
4444
cfg.style = "pep440"
45-
cfg.tag_prefix = ""
45+
cfg.tag_prefix = "v"
4646
cfg.parentdir_prefix = "merlin-systems-"
4747
cfg.versionfile_source = "merlin/systems/_version.py"
4848
cfg.verbose = False

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ VCS = git
2828
style = pep440
2929
versionfile_source = merlin/systems/_version.py
3030
versionfile_build = merlin/systems/_version.py
31-
tag_prefix =
31+
tag_prefix = v
3232
parentdir_prefix = merlin-systems-

tests/unit/test_version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
from packaging.version import Version
1617

1718
import merlin.systems
1819

1920

2021
def test_version():
2122
"""test to get back version of library"""
22-
assert merlin.systems.__version__ is not None
23+
assert Version(merlin.systems.__version__) >= Version("0.5.0")

0 commit comments

Comments
 (0)