Merge pull request #221 from blink1073/allow-next

Add 'next' convenience for tbump

Author: blink1073

docs/source/get_started/making_first_release.md

@@ -41,7 +41,8 @@ already uses Jupyter Releaser.
 
   ![Draft Changelog Workflow Dialog](../images/draft_changelog.png)
 
-  - The "New Version Spec" will usually be the full version (e.g. 0.7.1)
+  - The "New Version Spec" will usually be the full version (e.g. 0.7.1). Repos using `tbump` can also use the "next"
+    option, which will bump the micro version (or the build version in the case of a prerelease).
   - Use the "since" field to select PRs prior to the latest tag to include in the release
   - Type "true" in the "since the last stable git tag" if you would like to include PRs since the last non-prerelease version tagged on the target repository and branch.
   - The workflow will use the GitHub API to find the relevant pull requests and make an appropriate changelog entry.

jupyter_releaser/tests/test_functions.py

@@ -175,6 +175,14 @@ def test_bump_version(py_package):
         util.bump_version(spec)
         util.run("git commit -a -m 'bump version'")
         assert util.get_version() == spec
+    util.bump_version("1.0.2")
+    util.bump_version("next")
+    assert util.get_version() == "1.0.3"
+    util.bump_version("patch")
+    assert util.get_version() == "1.0.4"
+    util.bump_version("1.0.3a5")
+    util.bump_version("next")
+    assert util.get_version() == "1.0.3a6"
 
 
 def test_get_config_python(py_package):

jupyter_releaser/util.py

@@ -217,14 +217,24 @@ def bump_version(version_spec, version_cmd=""):
     if not version_cmd:  # pragma: no cover
         raise ValueError("Please specify a version bump command to run")
 
-    # Assign default values if not version spec was given
+    # Assign default values if no version spec was given
     if not version_spec:
         if "tbump" in version_cmd:
-            version = parse_version(get_version())
-            version_spec = f"{version.major}.{version.minor}.{version.micro + 1}"
+            version_spec = "next"
         else:
             version_spec = "patch"
 
+    # Add some convenience options on top of "tbump"
+    if "tbump" in version_cmd:
+        v = parse_version(get_version())
+        if version_spec == "next":
+            if v.is_prerelease:
+                version_spec = f"{v.major}.{v.minor}.{v.micro}{v.pre[0]}{v.pre[1] + 1}"
+            else:
+                version_spec = f"{v.major}.{v.minor}.{v.micro + 1}"
+        elif version_spec == "patch":
+            version_spec = f"{v.major}.{v.minor}.{v.micro + 1}"
+
     # Bump the version
     run(f"{version_cmd} {version_spec}")