ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-24 20:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Set .dev1 postfix correctly on non-master branches, some formatting

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-09-19 17:04:05 +02:00
parent 99b7533251
commit 7167b4cff9
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/utils.py
View File

@ -64,18 +64,27 @@ def get_git_version(cwd):
return check_output(["git", "describe", "--tags"], cwd=cwd).decode("utf-8").strip() 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): def get_version(cwd):
git_version = get_git_version(cwd) git_version = get_git_version(cwd)
git_branch = check_output(["git", "branch", "--show-current"], cwd=cwd).decode("utf-8").strip()
version = git_version[1:].split("-") version = git_version[1:].split("-")
if len(version) > 2: if len(version) > 2:
version = version[:2] version = version[:2]
if len(version) > 1: if len(version) > 1:
version = ".post".join(version) version = ".post".join(version)
if is_dev_build(): version += get_dev_extension(cwd)
version += ".dev0" if git_branch in ['', 'master'] else '.dev1'
else: else:
version = version[0] version = version[0]
@ -126,11 +135,15 @@ def main():
elif args.wait_pip: elif args.wait_pip:
version = get_version(args.dir) version = get_version(args.dir)
t0 = time.time() t0 = time.time()
while time.time()-t0 < 300 and not is_package_available(args.package, version): while time.time() - t0 < 300 and not is_package_available(
args.package, version
):
time.sleep(20) time.sleep(20)
if not is_package_available(args.package, version): if not is_package_available(args.package, version):
print(f"Timeout waiting for package {args.package}=={version} to be available on pypi") print(
f"Timeout waiting for package {args.package}=={version} to be available on pypi"
)
sys.exit(1) sys.exit(1)
else: else:
print("no action") print("no action")