Merge pull request #19 from dynobo/refactoring

Fix build pipeline

.github/workflows/build.yml

@@ -33,18 +33,9 @@ jobs:
         run: poetry run coveralls
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-      - name: Build and publish to PyPi-Test
-        run: |
-          poetry config repositories.pypi-test https://test.pypi.org/legacy/
-          poetry publish \
-            --build \
-            --repository=pypi-test \
-            --username __token__ \
-            --password ${{ secrets.PYPI_TEST_KEYHINT_TOKEN }}
+      # Prepare Release
       - name: Build AppImage
         run: poetry run make clean-build
-
-      # Release
       - name: Draft release
         uses: softprops/action-gh-release@v1
         with:
@@ -55,3 +46,12 @@ jobs:
           prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Publish to pypi-test
+      - name: Build and publish to PyPi-Test
+        run: |
+          poetry config repositories.pypi-test https://test.pypi.org/legacy/
+          poetry publish \
+            --build \
+            --repository=pypi-test \
+            --username __token__ \
+            --password ${{ secrets.PYPI_TEST_KEYHINT_TOKEN }}

.github/workflows/publish.yml

@@ -3,8 +3,6 @@ on:
   push:
     tags:
       - "v*.*.*"
-    branches:
-      - master
 jobs:
   publish:
     name: Publish to PyPi

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 name: Test
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   test_linux:

pyproject.toml

@@ -40,6 +40,7 @@ black = { version = "^20.8b1", allow-prereleases = true }
 pytest-cov = "^2.11.1"
 pre-commit = "^2.11.1"
 coveralls = "^3.0.1"
+bumpversion = "^0.6.0"
 
 
 [tool.isort]

setup.cfg

@@ -3,4 +3,13 @@ files = src
 follow_imports = skip
 
 [mypy-gi.*,setproctitle]
-ignore_missing_imports = True
+ignore_missing_imports = True
+
+[bumpversion]
+current_version = 0.2.0
+commit = True
+tag = False
+
+[bumpversion:file:pyproject.toml]
+
+[bumpversion:file:./src/keyhint/resources/ApplicationWindow.glade]