Omit commit hash and date stamp from doc version (#1322)

This also removes the dependency on setuptools-scm while building the
docs.

Fixes #1104.

diff --git a/docs/conf.py b/docs/conf.py
index 37a6f84864bea6076c14b762c5e93bc572585bbe..01d695f9e80dfdf1f3afc9b671b939160cf9427a 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,7 +17,7 @@ import re
 import shutil
 import string
 
-from setuptools_scm import get_version
+from pkg_resources import get_distribution
 from recommonmark.parser import CommonMarkParser
 
 
@@ -83,8 +83,8 @@ copyright = "2018, Łukasz Langa and contributors to Black"
 author = "Łukasz Langa and contributors to Black"
 
 # Autopopulate version
-# The full version, including alpha/beta/rc tags.
-release = get_version(root=CURRENT_DIR.parent)
+# The version, including alpha/beta/rc tags, but not commit hash and datestamps
+release = get_distribution("black").version.split("+")[0]
 # The short X.Y version.
 version = release
 for sp in "abcfr":

diff --git a/docs/requirements.txt b/docs/requirements.txt
index b0bb9102e6a4922e22b17ea3f584ddcfe0d72d30..a36fd8a675b2307fa0ac9920b75799be6e3c441e 100644 (file)
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,2 @@
 recommonmark==0.4.0
 Sphinx==1.7.2
-setuptools_scm==3.3.3

diff --git a/readthedocs.yml b/readthedocs.yml
index d8a016a14fc1d7f675a568525e741a74ffe3f4c3..15065033d0f83a9068dfbe4388fe9a27d1b0da52 100644 (file)
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -3,3 +3,5 @@ python:
   version: 3.8
   install:
     - requirements: docs/requirements.txt
+    - method: setuptools
+      path: .