Merge pull request #32 from ahebrank/restore-version

back to version file

Author: ahebrank

.github/workflows/publish.yml

@@ -15,26 +15,23 @@ jobs:
         run: |
           # from refs/tags/1.2.3 get 1.2.3
           VERSION=$( basename $GITHUB_REF )
-          PLACEHOLDER='version="develop"'
-          VERSION_FILE='setup.py'
+          PLACEHOLDER='__version__ = "0.0.0"'
+          VERSION_FILE='gwh/__version__.py'
           # fail out if placeholder not found
           grep "$PLACEHOLDER" "$VERSION_FILE"
-          sed -i "s/$PLACEHOLDER/version=\"${VERSION}\"/" "$VERSION_FILE"
+          sed -i "s/$PLACEHOLDER/__version__ = \"${VERSION}\"/" "$VERSION_FILE"
         shell: bash
 
+      - name: install, test cli
+        run: |
+          pip3 install .
+          python3 -m gwh --help
+
       - name: install dependencies & build
         run: |
           pip3 install setuptools wheel
           python3 setup.py sdist bdist_wheel
 
-      - name: publish to Test PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          skip_existing: true
-          user: __token__
-          password: ${{ secrets.TEST_PYPI_TOKEN }}
-          repository_url: https://test.pypi.org/legacy/
-
       - name: publish to PyPi
         if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+on: [push, pull_request]
+
+jobs:
+  publish:
+    name: build and publish to testpypi
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: install, test cli
+        run: |
+          pip3 install .
+          python3 -m gwh --help
+
+      - name: install dependencies & build
+        run: |
+          pip3 install setuptools wheel
+          python3 setup.py sdist bdist_wheel
+
+      - name: publish to Test PyPi
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip_existing: true
+          user: __token__
+          password: ${{ secrets.TEST_PYPI_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/

gwh/__main__.py

@@ -2,7 +2,7 @@
 import json
 
 from .__version__ import (
-    __title__,
+    __package__,
     __version__
 )
 from gwh import app
@@ -11,7 +11,7 @@
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(prog="python -m gwh", description="GitLab webhook handler")
     parser.add_argument("config", help="path to repos configuration")
-    parser.add_argument("--version", action="version", version=__title__ + " " + __version__)
+    parser.add_argument("--version", action="version", version=__package__ + " " + __version__)
     parser.add_argument("--host", help="server host", default="0.0.0.0")
     parser.add_argument("-p", "--port", help="server port", type=int, default=8080)
     parser.add_argument("--allow", help="whitelist GitLab IP block")

gwh/__version__.py

@@ -0,0 +1,3 @@
+__package__ = "gwh"
+# version is injected at build, do not change here
+__version__ = "0.0.0"

setup.py

@@ -1,9 +1,14 @@
 import os
 from setuptools import setup
 
+about = {}
+here = os.path.abspath(os.path.dirname(__file__))
+with open(os.path.join(here, 'gwh', '__version__.py'), encoding='utf-8') as f:
+    exec(f.read(), about)
+
 setup(
-    name="gwh",
-    version="develop",
+    name=about['__package__'],
+    version=about['__version__'],
     author='Andy Hebrank',
     author_email='[email protected]',
     packages=['gwh'],