From df21f4e4c0c6db5e433a253e1c26ca34bdb59819 Mon Sep 17 00:00:00 2001 From: CodeByMrFinchum Date: Fri, 3 Jan 2025 13:45:59 +0100 Subject: [PATCH] v0.0.4-a2, added __version__ so pypi version is dynamic --- CHANGELOG.md | 3 +++ pyproject.toml | 5 ++++- src/OptimaLab35/gui.py | 3 ++- src/OptimaLab35/main.py | 2 +- src/OptimaLab35/tui.py | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c16fe79..3863ee1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## 0.0.x +### 0.0.4-a2 +- Adding __version__ to `__init__.py` so version is automaticly updated in program as well as pypi. + ### 0.0.4-a1 - Refactored project structure, moving all code to the `src` directory. - Adjusted imports and setup to accommodate the new folder structure. diff --git a/pyproject.toml b/pyproject.toml index 4ac1707..afc1b33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "OptimaLab35" -version = "0.0.4-a1" +dynamic = ["version"] authors = [{ name = "Mr. Finchum" }] description = "User interface for OPTIMA35." readme = "README.md" @@ -24,3 +24,6 @@ OptimaLab35 = "OptimaLab35.main:main" [tool.hatch.build.targets.wheel] packages = ["src/OptimaLab35"] + +[tool.hatch.version] +path = "src/OptimaLab35/__init__.py" diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py index 9dc3c68..9b34deb 100644 --- a/src/OptimaLab35/gui.py +++ b/src/OptimaLab35/gui.py @@ -7,6 +7,7 @@ from OptimaLab35.utils.utility import Utilities from OptimaLab35.ui.main_window import Ui_MainWindow from OptimaLab35.ui.exif_handler_window import ExifEditor from OptimaLab35.ui.simple_dialog import SimpleDialog # Import the SimpleDialog class +from OptimaLab35 import __version__ from PySide6 import QtWidgets from PySide6.QtWidgets import ( @@ -28,7 +29,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow): def __init__(self): super(OptimaLab35, self).__init__() self.name = "OptimaLab35" - self.version = "0.0.4-a1" + self.version = __version__ self.ui = Ui_MainWindow() self.ui.setupUi(self) self.o = OptimaManager() diff --git a/src/OptimaLab35/main.py b/src/OptimaLab35/main.py index dad2062..6892ca8 100644 --- a/src/OptimaLab35/main.py +++ b/src/OptimaLab35/main.py @@ -1,7 +1,7 @@ import os from argparse import ArgumentParser from OptimaLab35 import gui, tui - +from OptimaLab35 import __version__ # Mainly from ChatGPT def check_pyside_installed(): try: diff --git a/src/OptimaLab35/tui.py b/src/OptimaLab35/tui.py index caf4c99..f547abc 100644 --- a/src/OptimaLab35/tui.py +++ b/src/OptimaLab35/tui.py @@ -4,11 +4,12 @@ from datetime import datetime from optima35.core import OptimaManager from OptimaLab35.utils.utility import Utilities from OptimaLab35.ui.simple_tui import SimpleTUI +from OptimaLab35 import __version__ class OptimaLab35_lite(): def __init__(self): self.name = "OptimaLab35-lite" - self.version = "0.0.4-a1" + self.version = __version__ self.o = OptimaManager() self.u = Utilities() self.tui = SimpleTUI()