Merge pull request #33 from quantmind/master

0.5.1

.github/workflows/build.yml

@@ -30,6 +30,8 @@ jobs:
     - name: install dataclasses
       if: matrix.python-version == '3.6'
       run: pip install dataclasses
+    - name: make validate
+      run: make validate
     - name: run lint
       run: make test-lint
     - name: git info

Makefile

@@ -30,13 +30,16 @@ test-lint:	## run linters check
 	./dev/run-black.sh --check
 
 version:	## Display version
-	@python3 -c "import agiletoolkit; print(agiletoolkit.__version__)"
+	@python -c "import agiletoolkit; print(agiletoolkit.__version__)"
 
 codecov:
 	codecov -t $(CODECOV_TOKEN)
 
 release-github:	## new tag in github
 	@python agile.py git release --yes
 
-release-pypi:		## release to pypi and github tag
+release-pypi:	## release to pypi and github tag
 	@twine upload dist/* --username lsbardel --password $(PYPI_PASSWORD)
+
+validate:	## validate version
+	@python agile.py git validate

agiletoolkit/__init__.py

@@ -1,3 +1,3 @@
 """Agile toolkit for devops and repository management"""
 
-__version__ = "0.5.0"
+__version__ = "0.5.1"

agiletoolkit/utils.py

@@ -159,5 +159,6 @@ def gitrepo(root=None):
     }
 
 
-def version() -> str:
-    return sh("make version").strip().split()[-1]
+def version():
+    version = sh("make -s version")
+    return version.strip().split()[-1]

tests/test_git.py

@@ -1,7 +1,6 @@
 import json
 from unittest import mock
 
-import pytest
 from click.testing import CliRunner
 
 from agiletoolkit.commands import start
@@ -17,7 +16,6 @@ def test_git():
     assert result.output.startswith("Usage:")
 
 
-@pytest.mark.skip("This fails in CI")
 def test_git_validate():
     runner = CliRunner()
     with gitrepo("deploy"):