From 9a2c1496827f62f797ca154a957d295091cbdfa1 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Thu, 7 Sep 2023 08:51:44 -0700 Subject: [PATCH 1/3] Update release.sh and bump_patch_version.py flow --- release/bump_patch_version.py | 18 +++++++++++++----- release/release.sh | 3 +-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/release/bump_patch_version.py b/release/bump_patch_version.py index 84cb45a8eac8..7ea2ac9a3ea4 100644 --- a/release/bump_patch_version.py +++ b/release/bump_patch_version.py @@ -3,12 +3,20 @@ # DeepSpeed Team +import argparse from packaging import version as pkg_version -with open('../version.txt') as fd: - version = pkg_version.parse(fd.read()) +parser = argparse.ArgumentParser() -with open('../version.txt', 'w') as fd: - fd.write(f'{version.major}.{version.minor}.{version.micro + 1}\n') +parser.add_argument("--current_version", + type=str, + help="The current version being published to help set the next version.") -print(f'{version} -> {version.major}.{version.minor}.{version.micro + 1}') +args = parser.parse_args() + +current_version = pkg_version.parse(args.current_version) + +with open('version.txt', 'w') as fd: + fd.write(f'{current_version.major}.{current_version.minor}.{current_version.micro + 1}\n') + +print(f'{current_version} -> {current_version.major}.{current_version.minor}.{current_version.micro + 1}') \ No newline at end of file diff --git a/release/release.sh b/release/release.sh index 1366532e8b06..3e14257374d1 100644 --- a/release/release.sh +++ b/release/release.sh @@ -45,5 +45,4 @@ git tag v${version} git push origin v${version} echo "bumping up patch version" -cd - -python bump_patch_version.py +python release/bump_patch_version.py --current_version ${version} From b693bcb82a2c64186c126e1491bbe03f3616849c Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Thu, 7 Sep 2023 09:00:33 -0700 Subject: [PATCH 2/3] Style fix --- release/bump_patch_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/bump_patch_version.py b/release/bump_patch_version.py index 7ea2ac9a3ea4..035b07da84ec 100644 --- a/release/bump_patch_version.py +++ b/release/bump_patch_version.py @@ -16,7 +16,7 @@ current_version = pkg_version.parse(args.current_version) -with open('version.txt', 'w') as fd: +with open('./version.txt', 'w') as fd: fd.write(f'{current_version.major}.{current_version.minor}.{current_version.micro + 1}\n') print(f'{current_version} -> {current_version.major}.{current_version.minor}.{current_version.micro + 1}') \ No newline at end of file From 05acad6154bae07609100f64680eff3a1cbacf08 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Thu, 7 Sep 2023 09:01:22 -0700 Subject: [PATCH 3/3] newline formattingh --- release/bump_patch_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/bump_patch_version.py b/release/bump_patch_version.py index 035b07da84ec..20827011d368 100644 --- a/release/bump_patch_version.py +++ b/release/bump_patch_version.py @@ -19,4 +19,4 @@ with open('./version.txt', 'w') as fd: fd.write(f'{current_version.major}.{current_version.minor}.{current_version.micro + 1}\n') -print(f'{current_version} -> {current_version.major}.{current_version.minor}.{current_version.micro + 1}') \ No newline at end of file +print(f'{current_version} -> {current_version.major}.{current_version.minor}.{current_version.micro + 1}')