Merge pull request #2860 from minrk/chartpress-2

Update chartpress to 2.1+ and adopt tbump in the release process

Author: consideRatio

RELEASE.md

@@ -65,8 +65,7 @@ Also the images we build are based on some image specified in the `FROM` stateme
     ```bash
     git checkout main
     git reset --hard <upstream>/main
-    git tag -a x.y.z-beta.1 -m x.y.z-beta.1 <commit on main>
-    git push --follow-tags <upstream> main
+    tbump x.y.z-beta.1
     ```
 
 - Announce the x.y.z-beta.1 release
@@ -89,8 +88,13 @@ Also the images we build are based on some image specified in the `FROM` stateme
     ```bash
     git checkout main
     git reset --hard <upstream>/main
-    git tag -a x.y.z -m x.y.z HEAD
-    git push --follow-tags <upstream> main
+    tbump x.y.z
+    ```
+
+  - [ ] Set the next prerelease version (don't create a tag).
+
+    ```bash
+    tbump --no-tag x.y.z+1-0.dev
     ```
 
   - [ ] Create a GitHub release.

chartpress.yaml

@@ -13,6 +13,7 @@ charts:
     # Dev: imagePrefix can be useful to override if you want to trial something
     #      locally developed in a remote k8s cluster.
     imagePrefix: jupyterhub/k8s-
+    baseVersion: "2.0.0-beta.1"
     repo:
       git: jupyterhub/helm-chart
       published: https://jupyterhub.github.io/helm-chart

dev-requirements.txt

@@ -5,7 +5,7 @@
 #
 # ref: https://github.com/jupyterhub/chartpress
 #
-chartpress>=1.1.0
+chartpress>=2.1,<3
 
 # pytest run tests that require requests and pyyaml
 pytest>=3.7.1
@@ -17,3 +17,6 @@ click
 
 # used to formatting and linting
 pre-commit>=2.0.0
+
+# used for tagging releases
+tbump

tbump.toml

@@ -0,0 +1,40 @@
+# tbump is a tool to update version fields that we use
+# to update baseVersion in chartpress.yaml as documented
+# in RELEASE.md
+#
+# Config reference: https://github.com/your-tools/tbump#readme
+#
+[version]
+current = "2.0.0-beta.1"
+
+# match our prerelease prefixes
+# -alpha.1
+# -beta.2
+# -0.dev
+
+regex = '''
+  (?P<major>\d+)
+  \.
+  (?P<minor>\d+)
+  \.
+  (?P<patch>\d+)
+  (\-
+    (?P<prelease>
+      (
+       (alpha|beta|rc)\.\d+|
+       0\.dev
+      )
+    )
+  )?
+  '''
+
+[git]
+message_template = "Bump to {new_version}"
+tag_template = "{new_version}"
+
+# For each file to patch, add a [[file]] config
+# section containing the path of the file, relative to the
+# tbump.toml location.
+[[file]]
+src = "chartpress.yaml"
+search = 'baseVersion: "{current_version}"'