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 7d2b0b134749997fcf6b88f45ccc60b3d125987c..37a6f84864bea6076c14b762c5e93bc572585bbe 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,26 +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():
-    black_py = CURRENT_DIR / ".." / "black.py"
-    _version_re = re.compile(r"__version__\s+=\s+(?P<version>.*)")
-    with open(str(black_py), "r", encoding="utf8") as f:
-        version = _version_re.search(f.read()).group("version")
-    return str(ast.literal_eval(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"


@@ -92,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":


@@ -161,7 +153,7 @@ html_theme_options = {
     "show_related": False,
     "description": "“Any color you like.”",
     "github_button": True,
     "show_related": False,
     "description": "“Any color you like.”",
     "github_button": True,

-    "github_user": "ambv",
+    "github_user": "psf",

     "github_repo": "black",
     "github_type": "star",
     "show_powered_by": True,
     "github_repo": "black",
     "github_type": "star",
     "show_powered_by": True,