Merge 54036eb into 0b7f8b5

sparkmicro · Aug 20, 2021 · 0ce7b33 · 0ce7b33
2 parents 0b7f8b5 + 54036eb
commit 0ce7b33
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/test_deploy.yaml b/.github/workflows/test_deploy.yaml
@@ -116,14 +116,15 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Alter the version in pyproject.toml
+      - name: Alter the version in pyproject.toml and overwrite __version__
         run: >
           GTAG=$(echo $REF | sed -e 's#.*/##') &&
           sed
           --in-place
           --expression
           "s/version = \".*\" # placeholder/version = \"$GTAG\"/g"
           pyproject.toml
+          echo "__version__ = $GTAG" > kintree/__init__.py
         env:
           REF: ${{ github.ref }}
       - name: Display the inferred version

diff --git a/kintree/__init__.py b/kintree/__init__.py
@@ -0,0 +1,11 @@
+# WARNING: This file is overwriten when publishing to PyPI
+# __version__ refers to the tag version instead
+
+# VERSION INFORMATION
+version_info = {
+    'MAJOR_REVISION': 0,
+    'MINOR_REVISION': 4,
+    'RELEASE_STATUS': 99,  # Dev = 99
+}
+
+__version__ = '.'.join([str(v) for v in version_info.values()])
diff --git a/kintree/config/settings.py b/kintree/config/settings.py
@@ -6,17 +6,6 @@
 from ..common.tools import cprint
 from .import config_interface
 
-# VERSION INFORMATION
-version_info = {
-    'MAJOR_REVISION': 0,
-    'MINOR_REVISION': 4,
-    'RELEASE_STATUS': 4,  # Digit means stable version
-}
-try:
-    version = '.'.join([str(v) for v in version_info.values()])
-except:
-    version = '0.0.alpha'
-
 # DEBUG
 # Testing
 ENABLE_TEST = False

diff --git a/kintree/kintree_gui.py b/kintree/kintree_gui.py
@@ -5,6 +5,8 @@
 # Webbrowser
 import webbrowser
 
+# Version
+from . import __version__
 # Settings
 from .config import settings as settings
 # PySimpleGUI
@@ -888,7 +890,7 @@ def main():
     ]
 
     # Create the Window
-    window = sg.Window(f'Ki-nTree [{settings.version}]',
+    window = sg.Window(f'Ki-nTree [{__version__}]',
                        layout,
                        location=(500, 500))
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kintree"
-version = "0.1.0" # placeholder
+version = "0.4.99" # placeholder
 description = "Fast part creation in KiCad and InvenTree"
 authors = ["eeintech <eeintech@eeinte.ch>"]
 maintainers = ["eeintech <eeintech@eeinte.ch>", "randrej <r.andrej@gmail.com>"]