From adcf25e7ba68d13f0ce3420d24fc91840b30e893 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Fri, 15 Aug 2025 17:48:21 +0100 Subject: Remove git based version handling --- klippy/klippy.py | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'klippy/klippy.py') diff --git a/klippy/klippy.py b/klippy/klippy.py index 17293af9..093b6619 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -8,6 +8,8 @@ import sys, os, gc, optparse, logging, time, collections, importlib import util, reactor, queuelogger, msgproto import gcode, configfile, pins, mcu, toolhead, webhooks +__version__ = "0.1.0-rc1" + message_ready = "Printer is ready" message_startup = """ @@ -367,44 +369,14 @@ def main(): else: logging.getLogger().setLevel(debuglevel) logging.info("Starting Klippy...") - git_info = util.get_git_version() - git_vers = git_info["version"] - extra_files = [ - fname - for code, fname in git_info["file_status"] - if ( - code in ("??", "!!") - and fname.endswith(".py") - and ( - fname.startswith("klippy/kinematics/") - or fname.startswith("klippy/extras/") - ) - ) - ] - modified_files = [fname for code, fname in git_info["file_status"] if code == "M"] - extra_git_desc = "" - if extra_files: - if not git_vers.endswith("-dirty"): - git_vers = git_vers + "-dirty" - if len(extra_files) > 10: - extra_files[10:] = ["(+%d files)" % (len(extra_files) - 10,)] - extra_git_desc += "\nUntracked files: %s" % (", ".join(extra_files),) - if modified_files: - if len(modified_files) > 10: - modified_files[10:] = ["(+%d files)" % (len(modified_files) - 10,)] - extra_git_desc += "\nModified files: %s" % (", ".join(modified_files),) - extra_git_desc += "\nBranch: %s" % (git_info["branch"]) - extra_git_desc += "\nRemote: %s" % (git_info["remote"]) - extra_git_desc += "\nTracked URL: %s" % (git_info["url"]) - start_args["software_version"] = git_vers + start_args["software_version"] = __version__ start_args["cpu_info"] = util.get_cpu_info() start_args["runtime_config"] = options.runtime_config if bglogger is not None: versions = "\n".join( [ "Args: %s" % (sys.argv,), - "Git version: %s%s" - % (repr(start_args["software_version"]), extra_git_desc), + "Version: %s" % (__version__,), "CPU: %s" % (start_args["cpu_info"],), "Python: %s" % (repr(sys.version),), ] -- cgit v1.2.3-70-g09d2