From df4aac219f2ae152ac469ddb71fba2cc35185885 Mon Sep 17 00:00:00 2001 From: jziolkowski Date: Mon, 21 Sep 2020 16:02:40 +0200 Subject: [PATCH] setup.py modules fix --- setup.py | 13 +++++++++++-- tasmotizer.py | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d769f6e..49014f2 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,14 @@ from setuptools import setup import os +import re + +def find_version(): + with open('tasmotizer.py', 'r') as version_file: + version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", + version_file.read(), re.M) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string.") if os.name == "nt": scripts = None @@ -14,9 +23,9 @@ else: setup( name='tasmotizer', - version="1.2", + version=find_version(), url='https://github.com/tasmota/tasmotizer', - py_modules=['tasmotizer', 'gui', 'tasmotizer_esptool', 'banner'], + py_modules=['tasmotizer', 'gui', 'tasmotizer_esptool', 'banner', 'utils'], license='GPLv3', author='jziolkowski', author_email='jacek@ziolkowscy.com', diff --git a/tasmotizer.py b/tasmotizer.py index a290b46..e3a6a19 100644 --- a/tasmotizer.py +++ b/tasmotizer.py @@ -22,6 +22,8 @@ import banner from gui import HLayout, VLayout, GroupBoxH, GroupBoxV, SpinBox, dark_palette from utils import MODULES, NoBinFile, NetworkError +__version__ = '1.2.1' + BINS_URL = 'http://ota.tasmota.com' @@ -495,7 +497,7 @@ class Tasmotizer(QDialog): self.esp_thread = None - self.setWindowTitle('Tasmotizer 1.2') + self.setWindowTitle(f'Tasmotizer {__version__}') self.setMinimumWidth(480) self.mode = 0 # BIN file