diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-13 12:56:17 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-13 12:56:17 -0500 |
| commit | e416f2f01a6ce7e7bb3fbd1df05de70111f1107d (patch) | |
| tree | 241e8d6058ab78ac14709ed7e461c447229496cd /docs | |
| parent | af4f2b73aaf7e47078c770074c8cf7f64528aac2 (diff) | |
| parent | 6d571b47f84e8ee87decbaffbd577c5f556efb4b (diff) | |
| download | pytest-runner-e416f2f01a6ce7e7bb3fbd1df05de70111f1107d.tar.gz | |
Merge with latest skeleton
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 41 | ||||
| -rw-r--r-- | docs/history.rst | 16 | ||||
| -rw-r--r-- | docs/index.rst | 34 |
3 files changed, 44 insertions, 47 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' diff --git a/docs/history.rst b/docs/history.rst index db85fec..907000b 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -1,8 +1,8 @@ -:tocdepth: 2
-
-.. _changes:
-
-History
-*******
-
-.. include:: ../CHANGES.txt
+:tocdepth: 2 + +.. _changes: + +History +******* + +.. include:: ../CHANGES.rst diff --git a/docs/index.rst b/docs/index.rst index 89e2112..5a04483 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,17 +1,17 @@ -Welcome to pytest-runner documentation!
-=======================================
-
-.. toctree::
- :maxdepth: 1
-
- history
-
-.. include:: ../README.txt
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
+Welcome to pytest-runner documentation! +======================================= + +.. toctree:: + :maxdepth: 1 + + history + +.. include:: ../README.txt + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + |