Merge with latest skeleton

1 files changed, 19 insertions, 22 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 32995af..81000ce 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,22 +1,19 @@
-#!/usr/bin/env python3

-# -*- coding: utf-8 -*-

-

-import setuptools_scm

-

-extensions = [

-    'sphinx.ext.autodoc',

-]

-

-# General information about the project.

-project = 'pytest-runner'

-copyright = '2015 Jason R. Coombs'

-

-import os

-root = os.path.relpath(os.path.join(os.path.dirname(__file__), '..'))

-

-# The short X.Y version.

-version = setuptools_scm.get_version(root=root)

-# The full version, including alpha/beta/rc tags.

-release = version

-

-master_doc = 'index'

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import setuptools_scm
+
+extensions = [
+    'sphinx.ext.autodoc',
+]
+
+# General information about the project.
+project = 'pytest-runner'
+copyright = '2015,2016 Jason R. Coombs'
+
+# The short X.Y version.
+version = setuptools_scm.get_version(root='..', relative_to=__file__)
+# The full version, including alpha/beta/rc tags.
+release = version
+
+master_doc = 'index'