From 67060ba72b59e189b7b2a3d3e3db65e43a699bb4 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 19 Nov 2022 09:39:00 -0800 Subject: [PATCH] remove redundant datetime computation in version script Instead of parsing the date Git gives us and then reformatting it into a new form, we can just ask Git to give it to us in the format we want. --- gen_version.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gen_version.py b/gen_version.py index e277186f7..9a5ad3e59 100644 --- a/gen_version.py +++ b/gen_version.py @@ -22,7 +22,6 @@ Entry version Entry collection Output """ import argparse -from datetime import datetime import os from pathlib import Path import re @@ -135,21 +134,18 @@ else: if not patch_version.isnumeric() or args.date_format: os.environ["TZ"] = "UTC" try: - committer_date = datetime.strptime( - subprocess.check_output( + committer_date = subprocess.check_output( [ "git", "log", "-n", "1", "--format=%cd", - "--date=format-local:%Y-%m-%d %H:%M:%S" + f"--date=format-local:{date_format}" ], cwd=os.path.abspath(os.path.dirname(__file__)), universal_newlines=True, - ).strip(), - "%Y-%m-%d %H:%M:%S", - ).strftime(date_format) + ).strip() except (subprocess.CalledProcessError, FileNotFoundError): sys.stderr.write("Warning: build not started in a Git clone, or Git is not " "installed: setting version date to 0.\n") -- 2.50.1