madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Reword comment
[etc/vim.git] / docs / conf.py
index 7d2b0b134749997fcf6b88f45ccc60b3d125987c..ce7536defbd6417be7c62c8fcbbba3c899bc41b0 100644 (file)
 # 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
 from pathlib import Path
-import re
+import regex as re
 import shutil
 import string
 
 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,