From 5eee2807351c126cbb1056d8b4ed09e33cb613e0 Mon Sep 17 00:00:00 2001 From: VALLONGOL Date: Mon, 1 Dec 2025 12:48:52 +0100 Subject: [PATCH] update spec and version --- markdownconverter.spec | 46 +++---------------------------- markdownconverter/_version.py | 51 +++++++++++++---------------------- 2 files changed, 22 insertions(+), 75 deletions(-) diff --git a/markdownconverter.spec b/markdownconverter.spec index 9d1a8a9..8467a8e 100644 --- a/markdownconverter.spec +++ b/markdownconverter.spec @@ -1,46 +1,6 @@ -# -*- mode: python ; coding: utf-8 -*- - block_cipher = None - import os -a = Analysis(scripts=['markdownconverter\\__main__.py'], - pathex=['markdownconverter'], - binaries=[], - datas=[('MarkdownConverter.ico', '.')], - hiddenimports=[], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=None, - noarchive=False) - +a = Analysis(scripts=['markdownconverter\\__main__.py'], pathex=['markdownconverter', '.'], binaries=[], datas=[('MarkdownConverter.ico', '.')], hiddenimports=[], hookspath=[], hooksconfig={}, runtime_hooks=[], excludes=[], win_no_prefer_redirects=False, win_private_assemblies=False, cipher=None, noarchive=False) pyz = PYZ(a.pure, a.zipped_data, cipher=None) - -exe = EXE(pyz, - a.scripts, - [], - exclude_binaries=True, - name='MarkdownConverter', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - runtime_tmpdir=None, - console=False, - disable_windowed_traceback=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None, - icon='MarkdownConverter.ico') - -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - upx_exclude=[], - name='MarkdownConverter') +exe = EXE(pyz, a.scripts, [], exclude_binaries=True, name='MarkdownConverter', debug=False, bootloader_ignore_signals=False, strip=False, upx=True, runtime_tmpdir=None, console=False, disable_windowed_traceback=False, target_arch=None, codesign_identity=None, entitlements_file=None, icon='MarkdownConverter.ico') +coll = COLLECT(exe, a.binaries, a.zipfiles, a.datas, strip=False, upx=True, upx_exclude=[], name='MarkdownConverter') diff --git a/markdownconverter/_version.py b/markdownconverter/_version.py index 112dce7..67c7296 100644 --- a/markdownconverter/_version.py +++ b/markdownconverter/_version.py @@ -3,15 +3,13 @@ # Contains build-time information scraped from Git (if available) # and a helper function to format version strings. - import re # --- Version Data (Generated) --- -# This section is automatically generated by the build process. -__version__ = "v.0.0.0.1-1-gc2e26b0" -GIT_COMMIT_HASH = "c2e26b07b32375917c6aafdf377ac710c58cdf69" +__version__ = "v.0.0.0.8-0-ge4e9b1d" +GIT_COMMIT_HASH = "e4e9b1d74730397bc0224da6deffc58050417e67" GIT_BRANCH = "master" -BUILD_TIMESTAMP = "2025-05-28T11:48:03Z" +BUILD_TIMESTAMP = "2025-12-01T11:48:26.387022+00:00" IS_GIT_REPO = True # --- Default Values (for comparison or fallback) --- @@ -19,7 +17,6 @@ DEFAULT_VERSION = "0.0.0+unknown" DEFAULT_COMMIT = "Unknown" DEFAULT_BRANCH = "Unknown" - # --- Helper Function --- def get_version_string(format_string=None): """ @@ -27,7 +24,7 @@ def get_version_string(format_string=None): Args: format_string (str, optional): A format string using placeholders. - Defaults to "{{version}} ({{branch}}/{{commit_short}})" if None. + Defaults to "{version} ({branch}/{commit_short})" if None. Placeholders: {{version}}: Full version string (e.g., 'v1.0.0-5-gabcdef-dirty') {{tag}}: Clean tag part if exists (e.g., 'v1.0.0'), else DEFAULT_VERSION. @@ -43,43 +40,33 @@ def get_version_string(format_string=None): str: The formatted version string, or an error message if formatting fails. """ if format_string is None: - format_string = "{version} ({branch}/{commit_short})" + format_string = "{version} ({branch}/{commit_short})" # Default format replacements = {} try: - replacements["version"] = __version__ if __version__ else DEFAULT_VERSION - replacements["commit"] = GIT_COMMIT_HASH if GIT_COMMIT_HASH else DEFAULT_COMMIT - replacements["commit_short"] = ( - GIT_COMMIT_HASH[:7] - if GIT_COMMIT_HASH and len(GIT_COMMIT_HASH) >= 7 - else DEFAULT_COMMIT - ) - replacements["branch"] = GIT_BRANCH if GIT_BRANCH else DEFAULT_BRANCH - replacements["timestamp"] = BUILD_TIMESTAMP if BUILD_TIMESTAMP else "Unknown" - replacements["timestamp_short"] = ( - BUILD_TIMESTAMP.split("T")[0] - if BUILD_TIMESTAMP and "T" in BUILD_TIMESTAMP - else "Unknown" - ) - replacements["is_git"] = "Git" if IS_GIT_REPO else "Unknown" - replacements["dirty"] = ( - "-dirty" if __version__ and __version__.endswith("-dirty") else "" - ) + replacements['version'] = __version__ if __version__ else DEFAULT_VERSION + replacements['commit'] = GIT_COMMIT_HASH if GIT_COMMIT_HASH else DEFAULT_COMMIT + replacements['commit_short'] = GIT_COMMIT_HASH[:7] if GIT_COMMIT_HASH and len(GIT_COMMIT_HASH) >= 7 else DEFAULT_COMMIT + replacements['branch'] = GIT_BRANCH if GIT_BRANCH else DEFAULT_BRANCH + replacements['timestamp'] = BUILD_TIMESTAMP if BUILD_TIMESTAMP else "Unknown" + replacements['timestamp_short'] = BUILD_TIMESTAMP.split('T')[0] if BUILD_TIMESTAMP and 'T' in BUILD_TIMESTAMP else "Unknown" + replacements['is_git'] = "Git" if IS_GIT_REPO else "Unknown" + replacements['dirty'] = "-dirty" if __version__ and __version__.endswith('-dirty') else "" tag = DEFAULT_VERSION if __version__ and IS_GIT_REPO: - match = re.match(r"^(v?([0-9]+)\.([0-9]+)\.([0-9]+))", __version__) + match = re.match(r'^(v?([0-9]+(?:\.[0-9]+)*))', __version__) if match: tag = match.group(1) - replacements["tag"] = tag + replacements['tag'] = tag output_string = format_string for placeholder, value in replacements.items(): - pattern = re.compile(r"{\s*" + re.escape(placeholder) + r"\s*}") - output_string = pattern.sub(str(value), output_string) + pattern = re.compile(r'{{\s*' + re.escape(placeholder) + r'\s*}}') + output_string = pattern.sub(str(value), output_string) - if re.search(r"{\s*[\w_]+\s*}", output_string): - pass + if re.search(r'{\s*\w+\s*}', output_string): + pass # Or log a warning: print(f"Warning: Unreplaced placeholders found: {output_string}") return output_string