Fix issue with type comments on lines with trailing commas (#1058)

[etc/vim.git] / docs / conf.py

diff --git a/docs/conf.py b/docs/conf.py
index 6421d53e0dd5bfed1646d02f35fdf98fc804b050..37a6f84864bea6076c14b762c5e93bc572585bbe 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,28 +12,18 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #

-import ast

 from pathlib import Path
 import re
 import shutil
 import string
 
 from pathlib import Path
 import re
 import shutil
 import string
 

+from setuptools_scm import get_version

 from recommonmark.parser import CommonMarkParser
 
 
 CURRENT_DIR = Path(__file__).parent
 
 
 from recommonmark.parser import CommonMarkParser
 
 
 CURRENT_DIR = Path(__file__).parent
 
 

-def get_version():
-    import sys
-
-    sys.path.append(str(CURRENT_DIR.parent))
-    from _version import get_versions
-
-    v = get_versions()
-    return v.get("closest-tag", v["version"])
-
-

 def make_pypi_svg(version):
     template = CURRENT_DIR / "_static" / "pypi_template.svg"
     target = CURRENT_DIR / "_static" / "pypi.svg"
 def make_pypi_svg(version):
     template = CURRENT_DIR / "_static" / "pypi_template.svg"
     target = CURRENT_DIR / "_static" / "pypi.svg"


@@ -94,7 +84,7 @@ author = "Łukasz Langa and contributors to Black"
 
 # Autopopulate version
 # The full version, including alpha/beta/rc tags.
 
 # Autopopulate version
 # The full version, including alpha/beta/rc tags.

-release = get_version()
+release = get_version(root=CURRENT_DIR.parent)

 # The short X.Y version.
 version = release
 for sp in "abcfr":
 # The short X.Y version.
 version = release
 for sp in "abcfr":