Merge pull request #116 from dnvgl/fix-dynamic-versioning

Fix version string in built distribution

.github/workflows/publish.yml

@@ -56,3 +56,11 @@ jobs:
       run: poetry publish --build
       env:
         POETRY_PYPI_TOKEN_PYPI : ${{ secrets.PYPI_API_TOKEN }}
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: builds
+        path: |
+          dist/qats-*.tar.gz
+          dist/qats-*.whl
+  

.github/workflows/test.yml

@@ -71,6 +71,8 @@ jobs:
         # Consider specifying version (version: 1.7.1 on Python 3.11)
         virtualenvs-create: true
         virtualenvs-in-project: true  #.venv in current directory
+    - name: Install dynamic versioning plugin
+      run: poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Load cached venv
       id: cached-poetry-dependencies
       uses: actions/cache@v3
@@ -105,3 +107,11 @@ jobs:
       run: |
         source .venv/bin/activate
         sphinx-build -b html docs/source docs/_build
+    - name: Upload artifacts
+      if: ${{ matrix.python-version == '3.11' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: test-builds
+        path: |
+          dist/qats-*.tar.gz
+          dist/qats-*.whl

.gitignore

@@ -109,8 +109,5 @@ code-snippets/
 # local test folders
 tmp*/*
 
-# version file written by poetry dynamic versioning
-*/_version.py
-
 # Poetry
 poetry.lock

pyproject.toml

@@ -6,17 +6,19 @@ authors = [
     "Per Voie <[email protected]>", 
     "Erling Lone <[email protected]>"
     ]
-# Repo and docs are optional fields in the project section. Consider to keep it here or to gather 
-# all URLs in the url section
-repository = "https://github.com/dnvgl/qats"
-documentation = "https://qats.readthedocs.io"
 license = "MIT"
 readme = "README.md"
 include = [
     "LICENSE",
     "CHANGELOG.md"
 ]
 
+[tool.poetry.urls]
+Source = "https://github.com/dnvgl/qats"
+Documentation = "https://qats.readthedocs.io"
+Download = "https://pypi.org/project/qats/"
+Issues = "https://github.com/dnvgl/qats/issues"
+
 [tool.poetry.dependencies]
 python = ">=3.8.1,<3.13"
 h5py = ">=3.5.0"
@@ -51,13 +53,6 @@ myst-parser = ">=2.0.0"
 [tool.poetry.scripts]
 qats = "qats.cli:main"
 
-
-[tool.poetry.urls]
-Source = "https://github.com/dnvgl/qats"
-Documentation = "https://qats.readthedocs.io"
-Download = "https://pypi.org/project/qats/"
-Issues = "https://github.com/dnvgl/qats/issues"
-
 # enable dynamic versioning using Git tags
 # https://pypi.org/project/poetry-dynamic-versioning/
 [tool.poetry-dynamic-versioning]
@@ -73,15 +68,6 @@ format-jinja = """
     {%- endif -%}
 """
 
-[tool.poetry-dynamic-versioning.files."qats/_version.py"]
-persistent-substitution = true
-initial-content = """
-# file generated by poetry dynamic versioning
-# don't change, don't track in version control
-__version__ = "0.0.0"
-__version_tuple__ = (0, 0, 0)
-"""
-
 [build-system]
 # https://pypi.org/project/poetry-dynamic-versioning/
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.1.1,<2.0.0"]

qats/__init__.py

@@ -4,12 +4,7 @@
 """
 from .ts import TimeSeries
 from .tsdb import TsDB
-
-# version string
-try:
-    from ._version import __version__
-except ImportError:
-    __version__ = "0.0.0"
+from ._version import __version__, __version_tuple__
 
 # summary
 __summary__ = __doc__

qats/_version.py

@@ -0,0 +1,4 @@
+# version substituted by poetry dynamic versioning during poetry build
+# don't change
+__version__ = "0.0.0"
+__version_tuple__ = (0, 0, 0)

qats/app/gui.py

@@ -36,12 +36,7 @@
 from .logger import QLogger
 from .threading import Worker
 from .widgets import CustomTableWidget, CustomTableWidgetItem, CustomTabWidget
-# version string
-# from .._version import __version__
-try:
-    from .._version import __version__
-except ImportError:
-    __version__ = "0.0.0"
+from .. import __version__
 
 LOGGING_LEVELS = dict(
     debug=logging.DEBUG,

qats/cli.py

@@ -5,7 +5,6 @@
 import argparse
 import os
 import sys
-import sysconfig
 
 from pkg_resources import resource_filename
 from qtpy.QtWidgets import QApplication