feat: support --commit for nox bump

Author: henryiii

docs/update_cmake_version.rst

@@ -17,7 +17,7 @@ If using nox, run::
     nox -s bump -- <version>
 
 
-And follow the instructions it gives you. Leave off the version to bump to the latest version.
+And follow the instructions it gives you. Leave off the version to bump to the latest version. Add `--commit` to run the commit procedure.
 
 Classic procedure:
 ------------------
@@ -48,7 +48,7 @@ Classic procedure:
 
     release=3.20.4
     git switch -c update-to-cmake-$release
-    git add CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst
+    git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst
     git commit -m "Update to CMake $release"
 
 4. Push the topic and create a `Pull Request`.

noxfile.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import argparse
 from pathlib import Path
 
 import nox
@@ -79,12 +80,45 @@ def bump(session: nox.Session) -> None:
     """
     Set to a new version, use -- <version>, otherwise will use the latest version.
     """
-    if session.posargs:
-        (version,) = session.posargs
-    else:
+    parser = argparse.ArgumentParser(description="Process some integers.")
+    parser.add_argument(
+        "--commit", action="store_true", help="Make a branch and commit."
+    )
+    parser.add_argument(
+        "version", nargs="?", help="The version to process - leave off for latest."
+    )
+    args = parser.parse_args(session.posargs)
+
+    if args.version is None:
         session.install("lastversion")
         version = session.run(
             "lastversion", "kitware/cmake", log=False, silent=True
         ).strip()
+    else:
+        version = args.version
+
     session.install("requests")
-    session.run("python", "scripts/update_cmake_version.py", version)
+
+    extra = [] if args.commit else ["--quiet"]
+    session.run("python", "scripts/update_cmake_version.py", version, *extra)
+
+    if args.commit:
+        session.run("git", "switch", "-c", f"update-to-cmake-{version}", external=True)
+        files = (
+            "CMakeUrls.cmake",
+            "docs/index.rst",
+            "README.rst",
+            "tests/test_distribution.py",
+            "docs/update_cmake_version.rst",
+        )
+        session.run(
+            "git",
+            "add",
+            "-u",
+            *files,
+            external=True,
+        )
+        session.run("git", "commit", "-m", f"Update to CMake {version}", external=True)
+        session.log(
+            'Complete! Now run: gh pr create --fill --body "Created by update_cmake_version.py"'
+        )

scripts/update_cmake_version.py

@@ -207,6 +207,11 @@ def main():
         action="store_true",
         help="If specified, only display the archive URLs and associated hashsums",
     )
+    parser.add_argument(
+        "--quiet",
+        action="store_true",
+        help="Hide the output",
+    )
     args = parser.parse_args()
     if args.collect_only:
         get_cmake_archive_urls_and_sha256s(args.cmake_version, verbose=True)
@@ -216,17 +221,16 @@ def main():
         update_tests(args.cmake_version)
         update_raw_versions(args.cmake_version)
 
-        print(
-            """Complete! Now run:
+        if not args.quiet:
+            msg = """\
+                Complete! Now run:
 
-    git switch -c update-to-cmake-{release}
-    git add CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst
-    git commit -m "Update to CMake {release}"
-    gh pr create --fill --body "Created by update_cmake_version.py"
-""".format(
-                release=args.cmake_version
-            )
-        )
+                git switch -c update-to-cmake-{release}
+                git add -u CMakeUrls.cmake docs/index.rst README.rst tests/test_distribution.py docs/update_cmake_version.rst
+                git commit -m "Update to CMake {release}"
+                gh pr create --fill --body "Created by update_cmake_version.py"
+                """
+            print(textwrap.dedent(msg.format(release=args.cmake_version)))
 
 
 if __name__ == "__main__":

setup.cfg

@@ -1,13 +1,13 @@
 [flake8]
-max-line-length: 120
+max-line-length: 130
 # Whether to display the pep8 instructions on failure (can be quite verbose)
 show-pep8: False
 # Whether to show source code for each failure
 show-source: True
 # Maximum cyclomatic complexity allowed
 max-complexity: 14
 format: pylint
-exclude: .git,.idea,.eggs,__pycache__,.tox,docs/conf.py,_skbuild,CMake-src,versioneer.py,_version.py,.venv,.nox,noxfile.py
+exclude: .git,.idea,.eggs,__pycache__,.tox,docs/conf.py,_skbuild,CMake-src,versioneer.py,_version.py,.venv,.nox
 
 [tool:pytest]
 testpaths = tests