GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 25cbdaf1 authored by juga  's avatar juga 💬

fix: scripts: Stop bumping to next prerelease version

since it is now managed automatically by versioneer.
Instead, suggest creating a "next" maintainance branch.
But stop using `-` and `.` characters in it, to type it faster, since
most of the new branches will be based on it.
parent 12001ae6
...@@ -62,14 +62,6 @@ def obtain_release_version(version): ...@@ -62,14 +62,6 @@ def obtain_release_version(version):
sys.exit(1) sys.exit(1)
def obtain_next_prerelease_version(release_version):
# Assuming that we are only jumping from release to `-dev0`
next_prerelease_version = semantic_version.Version(
str(release_version.next_patch()) + "-dev0"
)
return next_prerelease_version
def main(args): def main(args):
print(__doc__) print(__doc__)
try: try:
...@@ -141,22 +133,16 @@ def main(args): ...@@ -141,22 +133,16 @@ def main(args):
input("Press enter when done.") input("Press enter when done.")
print("\nRelease done!!!.") print("\nRelease done!!!.")
print("\n8. Create next prerelease version") print("\n8. Create next prerelease branch")
print("---------------------------------") print("----------------------------------")
next_prerelease_version = obtain_next_prerelease_version(release_version) print("\nIf this release happens in a maintainance branch, merge the "
print("\nReplacing the version in the program with " "the commit to master and push, eg:"
"the next prerelease version...") "git checkout master"
replace_version(release_version, next_prerelease_version) "git merge --no-ff mybranch"
"git push myremote master")
print("\nCommitting the prerelease version...") next_branch_version = "maint{}".format(release_version)
subprocess.call(['git', 'commit', print("And create the next prerelease branch, eg:")
'-am', '"Bump to {}."'.format(next_prerelease_version)]) "git checkout -b {}".format(next_branch_version)
print("\n9. Push commit")
print("--------------")
input("Press enter when you are sure everything is correct.")
subprocess.call(['git', 'push', 'origin', 'master'])
print("Done!")
if __name__ == "__main__": if __name__ == "__main__":
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment