Add git count for devN without hash

setup.py

@@ -0,0 +1,6 @@
+from setuptools import setup  # type: ignore
+
+from twitchio._version import _get_version
+
+
+setup(version=_get_version(with_hash=False))

twitchio/__main__.py

@@ -24,11 +24,12 @@
 
 import argparse
 import platform
-import re
 import sys
 
 import aiohttp
 
+from ._version import _get_version
+
 
 try:
     import starlette
@@ -51,35 +52,6 @@
 args = parser.parse_args()
 
 
-def _get_version() -> str:
-    version = ""
-    with open("twitchio/__init__.py") as f:
-        match = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE)
-
-    if not match or not match.group(1):
-        raise RuntimeError("Version is not set")
-
-    version = match.group(1)
-
-    if version.endswith(("dev", "a", "b", "rc")):
-        # append version identifier based on commit count
-        try:
-            import subprocess
-
-            p = subprocess.Popen(["git", "rev-list", "--count", "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            out, _ = p.communicate()
-            if out:
-                version += out.decode("utf-8").strip()
-            p = subprocess.Popen(["git", "rev-parse", "--short", "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            out, _ = p.communicate()
-            if out:
-                version += "+g" + out.decode("utf-8").strip()
-        except Exception:
-            pass
-
-    return version
-
-
 def version_info() -> None:
     python_info = "\n".join(sys.version.split("\n"))
 

twitchio/_version.py

@@ -0,0 +1,32 @@
+import re
+
+
+def _get_version(with_hash: bool = True) -> str:  # type: ignore
+    version = ""
+    with open("twitchio/__init__.py") as f:
+        match = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', f.read(), re.MULTILINE)
+
+    if not match or not match.group(1):
+        raise RuntimeError("Version is not set")
+
+    version = match.group(1)
+
+    if version.endswith(("dev", "a", "b", "rc")):
+        # append version identifier based on commit count
+        try:
+            import subprocess
+
+            p = subprocess.Popen(["git", "rev-list", "--count", "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out, _ = p.communicate()
+            if out:
+                version += out.decode("utf-8").strip()
+
+            if with_hash:
+                p = subprocess.Popen(["git", "rev-parse", "--short", "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                out, _ = p.communicate()
+                if out:
+                    version += "+g" + out.decode("utf-8").strip()
+        except Exception:
+            pass
+
+    return version