Merge branch 'main' into patch-1

1 files changed, 16 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 1e0d81da3..769bc66e1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,32 @@
 from datetime import datetime
 from setuptools import setup
 from pathlib import Path
+import subprocess
+import re
 
 stub_root = Path("circuitpython-stubs")
 stubs = [p.relative_to(stub_root).as_posix() for p in stub_root.glob("*.pyi")]
 
-now = datetime.utcnow()
-version = now.strftime("%Y.%m.%d")
+git_out = subprocess.check_output(["git", "describe", "--tags"])
+version = git_out.strip().decode("utf-8")
+
+# Detect a development build and mutate it to be valid semver and valid python version.
+pieces = version.split("-")
+if len(pieces) > 2:
+    # Merge the commit portion onto the commit count since the tag.
+    pieces[-2] += "+" + pieces[-1]
+    pieces.pop()
+    # Merge the commit count and build to the pre-release identifier.
+    pieces[-2] += ".dev." + pieces[-1]
+    pieces.pop()
+version = "-".join(pieces)
 
 setup(
     name="circuitpython-stubs",
     description="PEP 561 type stubs for CircuitPython",
     url="https://github.com/adafruit/circuitpython",
     maintainer="CircuitPythonistas",
+    maintainer_email="circuitpython@adafruit.com",
     author_email="circuitpython@adafruit.com",
     version=version,
     license="MIT",