fix versions

Author: Michael Sieberer

.github/workflows/pythonpublish.yml

@@ -19,7 +19,8 @@ jobs:
       shell: bash
       run: |
         ver=$(echo ${{ github.event.release.tag_name }}  | sed 's/[^0-9]//')
-        printf "__version__ = '%s'" "$ver" > CryMOS/version.py
+        echo "package version is" "$ver"
+        printf "::set-output name=version::%s" "$ver"
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
@@ -40,7 +41,8 @@ jobs:
             python setup.py download_boost
             export BOOST_ROOT="$PWD/build/boost_1_72_0"
         fi
-        python setup.py sdist bdist_wheel
+        export PM_MOS_VERSION=${{ steps.set_version.outputs.version }}
+        python setup.py bdist_wheel
         cd dist
         printf "::set-output name=whl_file::%s" *.whl
       #   twine upload dist/*
@@ -51,7 +53,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ github.event.release.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        upload_url: ${{ github.event.release.upload_url }}
         asset_path: dist/${{ steps.build.outputs.whl_file }}
         asset_name: ${{ steps.build.outputs.whl_file }}
         asset_content_type: application/x-wheel+zip

CryMOS/__init__.py

@@ -10,8 +10,7 @@
 The copyright (c) is with Infineon Technologies Austria AG, 2020.
 See the LICENSE file for the licensing terms. """
 
-__version__ = '0.1'
-
+from .version import __version__
 from .Bulk import BulkModel, BulkModelFD, BulkModelTails
 from .QV import *
 from .IV import *

CryMOS/cpp/build.py

@@ -20,26 +20,32 @@ def __str__(self):
         return pybind11.get_include(self.user)
 
 
-def get_boost_include(builddir='build'):
-    import os
+class get_boost_include:
+    """ get boost include, this is quite hacky """
 
-    root = None
+    def __init__(self, builddir='build'):
+        self.builddir = builddir
 
-    if 'BOOST_ROOT' in os.environ:
-        root = os.environ['BOOST_ROOT']
-    else:
-        path = [builddir, '.', '~', os.path.dirname(__file__) + '/../../build']
+    def __str__(self):
+        import os
+
+        root = None
 
-        for p in path:
-            root = os.path.expanduser(p + '/boost_1_72_0')
-            if os.path.exists(root):
-                break
+        if 'BOOST_ROOT' in os.environ:
+            root = os.environ['BOOST_ROOT']
+        else:
+            path = [self.builddir, '.', '~', os.path.dirname(__file__) + '/../../build']
 
-    if root is None or not os.path.exists(root + '/boost'):
-        from warnings import warn
-        warn("boost libraries could not be found, you might want to set `BOOST_ROOT`")
+            for p in path:
+                root = os.path.expanduser(p + '/boost_1_72_0')
+                if os.path.exists(root):
+                    break
+
+        if root is None or not os.path.exists(root + '/boost'):
+            from warnings import warn
+            warn("boost libraries could not be found, you might want to set `BOOST_ROOT`")
 
-    return root
+        return root
 
 
 class BuildExt(build_ext):

CryMOS/version.py

@@ -0,0 +1,19 @@
+__version__ = None
+
+try:  # try to get version from git
+    from subprocess import run
+    from os.path import dirname
+    dir = dirname(__file__)
+
+    proc = run('git tag -l --sort=-v:refname',
+               capture_output=True, shell=True, check=True, text=True, cwd=dir)
+    tags = [t for t in proc.stdout.split() if t.startswith('v')]
+    ver = tags[0].replace('v', '')
+
+    proc = run('git log --abbrev-commit --format=%h -1',
+               capture_output=True, shell=True, check=True, text=True, cwd=dir)
+    hash = proc.stdout.strip()
+
+    __version__ = ver + '.dev0+git.' + hash
+except:
+    pass

setup.py

@@ -1,11 +1,22 @@
 from setuptools import setup
 import distutils.cmd
+from distutils.command.build_py import build_py
 
 # don't import CryMOS!
 build_cpp = {'__file__': 'CryMOS/cpp/build.py'}
 with open('CryMOS/cpp/build.py') as f:
     exec(f.read(), build_cpp)
 
+ver_file = {'__file__': 'CryMOS/version.py'}
+with open('CryMOS/version.py') as f:
+    exec(f.read(), ver_file)
+
+import os
+if 'PM_MOS_VERSION' in os.environ:
+    version = os.environ['PM_MOS_VERSION']
+else:
+    version = ver_file['__version__']
+
 
 class DwnlBoostCommand(distutils.cmd.Command):
     """A custom command to run Pylint on all Python source files."""
@@ -79,10 +90,32 @@ def download_boost_archive(self):
 
         return contents
 
+class BuildPyFixVersion(build_py):
+    """ fix version when building"""
+
+    user_options = build_py.user_options + [
+        ('version=', None, 'Version Name')
+    ]
+
+    def initialize_options(self):
+        super().initialize_options()
+        self.version = version
+
+    def run(self):
+        super().run()
+        self.fix_version()
+
+    def fix_version(self):
+        print("version is", self.version)
+
+        file = self.build_lib + "/CryMOS/version.py"
+        with open(file, 'w') as f:
+            f.write(f"__version__ = '{self.version}'\n")
+
 
 setup(
     name='pm-mos-model',
-    version='0.1',
+    version=version,
     packages=['CryMOS', 'CryMOS.cpp'],
     url='https://github.com/michi7x7/pm-mos-model',
     license='Apache License 2.0',
@@ -96,5 +129,6 @@ def download_boost_archive(self):
     cmdclass={
         'download_boost': DwnlBoostCommand,
         'build_ext': build_cpp['BuildExt'],
+        'build_py': BuildPyFixVersion,
     }
 )