Centralize version string formatting in __init__.py.

PEP 440 canonical forms differ between pre-release tags (2.2.0rc1, no
dot) and dev/post tags (2.2.0.dev1, with dot), so a single
".".join(__version_info__) cannot produce both correctly. Introduce a
_format_version helper that applies the dev/post-vs-pre-release rule in
one place, fix the existing ".dev1" tuple element (which produced the
malformed "2.2.0..dev1"), and have docs/conf.py and the workflow verify
step read the resulting __version__ via ast instead of re-deriving it.

Author: GrahamDumpleton

.github/workflows/build-test-release.yml

@@ -318,7 +318,21 @@ jobs:
       - name: Verify version matches tag
         run: |
           EXPECTED="${{ steps.meta.outputs.version }}"
-          ACTUAL="$(python -c "import ast, re; src=open('src/wrapt/__init__.py').read(); m=re.search(r'__version_info__\s*=\s*(\([^)]+\))', src); parts=ast.literal_eval(m.group(1)); print(''.join(p if p.startswith('.') else '.'+p for p in parts).lstrip('.'))")"
+          ACTUAL="$(python <<'PY'
+          import ast
+          src = open('src/wrapt/__init__.py').read()
+          tree = ast.parse(src)
+          ns = {}
+          for node in tree.body:
+              if isinstance(node, ast.FunctionDef) and node.name == "_format_version":
+                  exec(compile(ast.Module(body=[node], type_ignores=[]), '<v>', 'exec'), ns)
+              elif isinstance(node, ast.Assign):
+                  names = [t.id for t in node.targets if isinstance(t, ast.Name)]
+                  if any(n.startswith('__version') for n in names):
+                      exec(compile(ast.Module(body=[node], type_ignores=[]), '<v>', 'exec'), ns)
+          print(ns['__version__'])
+          PY
+          )"
           if [ "$ACTUAL" != "$EXPECTED" ]; then
               echo "Tag version ($EXPECTED) does not match __version__ ($ACTUAL) in src/wrapt/__init__.py" >&2
               exit 1

docs/conf.py

@@ -49,17 +49,21 @@
 # built documents.
 
 _init = pathlib.Path(__file__).resolve().parent.parent / "src" / "wrapt" / "__init__.py"
+_ns = {}
 for node in ast.parse(_init.read_text()).body:
-    if isinstance(node, ast.Assign) and any(
-        getattr(t, "id", None) == "__version_info__" for t in node.targets
+    if isinstance(node, ast.FunctionDef) and node.name == "_format_version":
+        exec(compile(ast.Module(body=[node], type_ignores=[]), "<v>", "exec"), _ns)
+    elif isinstance(node, ast.Assign) and any(
+        getattr(t, "id", None) in ("__version_info__", "__version__")
+        for t in node.targets
     ):
-        version_info = ast.literal_eval(node.value)
-        break
+        exec(compile(ast.Module(body=[node], type_ignores=[]), "<v>", "exec"), _ns)
 
+version_info = _ns["__version_info__"]
 # The short X.Y version.
 version = ".".join(version_info[:2])
 # The full version, including alpha/beta/rc tags.
-release = ".".join(version_info)
+release = _ns["__version__"]
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/wrapt/__init__.py

@@ -2,8 +2,15 @@
 Wrapt is a library for decorators, wrappers and monkey patching.
 """
 
-__version_info__ = ("2", "2", "0", ".dev1")
-__version__ = ".".join(__version_info__)
+def _format_version(parts):
+    base = ".".join(parts[:3])
+    if len(parts) == 3:
+        return base
+    suffix = parts[3]
+    return f"{base}.{suffix}" if suffix.startswith(("dev", "post")) else f"{base}{suffix}"
+
+__version_info__ = ("2", "2", "0", "dev1")
+__version__ = _format_version(__version_info__)
 
 from .__wrapt__ import (
     BaseObjectProxy,