Fix pytest error on Travis.

jdgarrett · jdgarrett · commit 8f1673de3ef5 · 2019-10-02T00:23:26.000-04:00
Signed-off-by: Johnathan Garrett &lt;jd@prominentedge.com&gt;
diff --git a/.utility/run-python-tests.sh b/.utility/run-python-tests.sh
@@ -19,6 +19,7 @@ source ./tests-venv/bin/activate
 pip install wheel
 pip install -r requirements.txt
 
+mvn -Dexec.executable=echo -Dexec.args='${project.version}' -f ../../../.. --non-recursive exec:exec
 pytest --cov-report= --cov=pygw pygw/test/
 EXIT_CODE=$?
 
diff --git a/python/src/main/python/maven_version.py b/python/src/main/python/maven_version.py
@@ -11,10 +11,14 @@
 
 def get_maven_version():
     version = subprocess.check_output([
-        "mvn", "-q", "-Dexec.executable=echo", "-Dexec.args='${project.version}'", "-f", "../../..", "exec:exec"
+        "mvn", "-q", "-Dexec.executable=echo", "-Dexec.args='${project.version}'", "-f", "../../../..", "--non-recursive", "exec:exec"
     ]).strip().decode().replace("-", ".")
     if ("SNAPSHOT" in version):
-        git_description = subprocess.check_output(["git", "describe"]).strip().decode()
-        dev_count = re.search("-(.*)-", git_description).group(1)
+        git_description = subprocess.check_output(["git", "describe", "--always"]).strip().decode()
+        count_search = re.search("-(.*)-", git_description)
+        if (count_search is not None):
+            dev_count = count_search.group(1)
+        else:
+            dev_count = "0"
         version = version.replace("SNAPSHOT", "dev" + dev_count)
     return version.lower()
