From 5025ac4022c1f6e5f70e4744a09f02683420f276 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Wed, 4 Jun 2025 17:56:10 +0200 Subject: [PATCH] Use .dev0 for all dev builds on pypi --- tests/utils.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index 9a79e670..238f6536 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -64,18 +64,6 @@ def get_git_version(cwd): return check_output(["git", "describe", "--tags"], cwd=cwd).decode("utf-8").strip() -def get_dev_extension(cwd): - if not is_dev_build(): - return "" - - # if the current commit does not belong to master, build a .dev1 package to avoid name conflicts for subsequent nightly builds from master - try: - check_output(["git", "merge-base", "--is-ancestor", "HEAD", "master"], cwd=cwd) - return ".dev0" - except: - return ".dev1" - - def get_version(cwd): git_version = get_git_version(cwd) @@ -84,7 +72,8 @@ def get_version(cwd): version = version[:2] if len(version) > 1: version = ".post".join(version) - version += get_dev_extension(cwd) + if is_dev_build(): + version += ".dev0" else: version = version[0]