Improve pytest header

waltznetworks · Aug 26, 2018 · 48427ae · 48427ae
1 parent 8f253cf
commit 48427ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
@@ -61,8 +61,7 @@
     __version__ = __version__[:-1]  # remove '+' for PEP-440 version spec.
     try:
         import subprocess
-        p = subprocess.Popen(['git', 'show', '-s', '--pretty=format:%h',
-                              path.join(package_dir, '..')],
+        p = subprocess.Popen(['git', 'show', '-s', '--pretty=format:%h'],
                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
         if out:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -11,8 +11,10 @@
 import shutil
 import sys
 
+import docutils
 import pytest
 
+import sphinx
 from sphinx.testing.path import path
 
 pytest_plugins = 'sphinx.testing.fixtures'
@@ -34,8 +36,8 @@ def rootdir():
 
 
 def pytest_report_header(config):
-    return 'Running Sphinx test suite (with Python %s)...' % (
-        sys.version.split()[0])
+    return ("libraries: Sphinx-%s, docutils-%s" %
+            (sphinx.__display_version__, docutils.__version__))
 
 
 def _initialize_test_directory(session):