Fix/package workflow

.github/workflows/build_tests.yml

@@ -6,6 +6,17 @@ on:
   pull_request:
     branches:
       - dev
+    paths-ignore:
+      - 'ovos_utils/version.py'
+      - 'test/**'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'readme.md'
+      - 'scripts/**'
   workflow_dispatch:
 
 jobs:

.github/workflows/publish_alpha.yml

@@ -7,10 +7,10 @@ on:
       - dev
     paths-ignore:
       - 'ovos_utils/version.py'
-      - 'setup.py'
       - 'test/**'
       - 'examples/**'
       - '.github/**'
+      - '.gitignore'
       - 'LICENSE'
       - 'CHANGELOG.md'
       - 'MANIFEST.in'

.github/workflows/publish_build.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Install Build Tools
         run: |
           python -m pip install build wheel
-      - name: Increment Version
+      - name: Remove alpha (declare stable)
         run: |
           VER=$(python setup.py --version)
-          python scripts/bump_build.py
+          python scripts/remove_alpha.py
       - name: "Generate release changelog"
         uses: heinrichreimer/github-changelog-generator-action@v2.3
         with:
@@ -31,7 +31,7 @@ jobs:
       - name: Commit to dev
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Increment Version
+          commit_message: Declare alpha stable
           branch: dev
       - name: Push dev -> master
         uses: ad-m/github-push-action@master
@@ -58,6 +58,18 @@ jobs:
       - name: Build Distribution Packages
         run: |
           python setup.py bdist_wheel
+      - name: Prepare next Build version
+        run: echo "::set-output name=version::$(python setup.py --version)"
+        id: alpha
+      - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0
+        run: |
+          VER=$(python setup.py --version)
+          python scripts/bump_build.py
+      - name: Commit to dev
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Prepare Next Version
+          branch: dev
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

.github/workflows/publish_major.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Install Build Tools
         run: |
           python -m pip install build wheel
-      - name: Increment Version
+      - name: Remove alpha (declare stable)
         run: |
           VER=$(python setup.py --version)
-          python scripts/bump_major.py
+          python scripts/remove_alpha.py
       - name: "Generate release changelog"
         uses: heinrichreimer/github-changelog-generator-action@v2.3
         with:
@@ -31,7 +31,7 @@ jobs:
       - name: Commit to dev
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Increment Version
+          commit_message: Declare alpha stable
           branch: dev
       - name: Push dev -> master
         uses: ad-m/github-push-action@master
@@ -58,6 +58,18 @@ jobs:
       - name: Build Distribution Packages
         run: |
           python setup.py bdist_wheel
+      - name: Prepare next Major version
+        run: echo "::set-output name=version::$(python setup.py --version)"
+        id: alpha
+      - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0
+        run: |
+          VER=$(python setup.py --version)
+          python scripts/bump_major.py
+      - name: Commit to dev
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Prepare Next Version
+          branch: dev
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

.github/workflows/publish_minor.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Install Build Tools
         run: |
           python -m pip install build wheel
-      - name: Increment Version
+      - name: Remove alpha (declare stable)
         run: |
           VER=$(python setup.py --version)
-          python scripts/bump_minor.py
+          python scripts/remove_alpha.py
       - name: "Generate release changelog"
         uses: heinrichreimer/github-changelog-generator-action@v2.3
         with:
@@ -31,7 +31,7 @@ jobs:
       - name: Commit to dev
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Increment Version
+          commit_message: Declare alpha stable
           branch: dev
       - name: Push dev -> master
         uses: ad-m/github-push-action@master
@@ -58,6 +58,18 @@ jobs:
       - name: Build Distribution Packages
         run: |
           python setup.py bdist_wheel
+      - name: Prepare next Minor version
+        run: echo "::set-output name=version::$(python setup.py --version)"
+        id: alpha
+      - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0
+        run: |
+          VER=$(python setup.py --version)
+          python scripts/bump_minor.py
+      - name: Commit to dev
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Prepare Next Version
+          branch: dev
       - name: Publish to Test PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:

.github/workflows/unit_tests.yml

@@ -5,9 +5,31 @@ on:
   pull_request:
     branches:
       - dev
+    paths-ignore:
+      - 'ovos_utils/version.py'
+      - 'requirements/**'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'readme.md'
+      - 'scripts/**'
   push:
     branches:
       - master
+    paths-ignore:
+      - 'ovos_utils/version.py'
+      - 'requirements/**'
+      - 'examples/**'
+      - '.github/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'MANIFEST.in'
+      - 'readme.md'
+      - 'scripts/**'
   workflow_dispatch:
 
 jobs:
@@ -33,8 +55,6 @@ jobs:
           pip install .
       - name: Install test dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install .[extras]
           pip install pytest pytest-timeout pytest-cov
       - name: Run unittests
         run: |

.gitignore

@@ -0,0 +1,20 @@
+dev.env
+.dev_opts.json
+.idea
+*.code-workspace
+*.pyc
+*.swp
+*~
+*.egg-info/
+build
+dist
+.coverage
+/htmlcov
+.installed
+.mypy_cache
+.vscode
+.theia
+.venv/
+
+# Created by unit tests
+.pytest_cache/

scripts/remove_alpha.py

@@ -0,0 +1,13 @@
+import fileinput
+from os.path import join, dirname
+
+
+version_file = join(dirname(dirname(__file__)), "ovos_utils", "version.py")
+
+alpha_var_name = "VERSION_ALPHA"
+
+for line in fileinput.input(version_file, inplace=True):
+    if line.startswith(alpha_var_name):
+        print(f"{alpha_var_name} = 0")
+    else:
+        print(line.rstrip('\n'))