From 7040d13f76dee5fd383615e32ee5b7241e632cbd Mon Sep 17 00:00:00 2001
From: Ovv <contact@ovv.wtf>
Date: Tue, 27 Feb 2018 12:27:21 +0100
Subject: [PATCH 1/5] Add back tox

---
 src/tox.ini | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/tox.ini

diff --git a/src/tox.ini b/src/tox.ini
new file mode 100644
index 000000000..4ea231f46
--- /dev/null
+++ b/src/tox.ini
@@ -0,0 +1,22 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+skipsdist = True
+envlist = py34, py35, py36, pycodestyle
+
+[testenv]
+commands = pytest
+deps = -r{toxinidir}/../requirements.txt
+
+[testenv:pycodestyle]
+commands=pycodestyle
+deps=pycodestyle
+
+[pycodestyle]
+exclude=
+  .tox,
+  migrations,
+  paperless/settings.py

From ea1260c2ce3bcd8b2ed4142afebdf71d8499e2ce Mon Sep 17 00:00:00 2001
From: Ovv <contact@ovv.wtf>
Date: Tue, 27 Feb 2018 13:29:54 +0100
Subject: [PATCH 2/5] Add documentation testing

---
 .travis.yml   |  3 ++-
 src/setup.cfg |  2 +-
 src/tox.ini   | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92ee7eddb..59b2a7c5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,12 @@ matrix:
 
 install:
     - pip install --requirement requirements.txt
-
+    - pip install sphinx
 script:
     - cd src/
     - pytest --cov
     - pycodestyle
+    - sphinx-build -b html docs docs/_build -W
 
 after_success:
     - coveralls
diff --git a/src/setup.cfg b/src/setup.cfg
index e70395525..1112934c0 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -1,5 +1,5 @@
 [pycodestyle]
-exclude = migrations, paperless/settings.py
+exclude = migrations, paperless/settings.py, .tox
 
 
 [tool:pytest]
diff --git a/src/tox.ini b/src/tox.ini
index 4ea231f46..98e44e063 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 skipsdist = True
-envlist = py34, py35, py36, pycodestyle
+envlist = py34, py35, py36, pycodestyle, doc
 
 [testenv]
 commands = pytest
@@ -15,8 +15,8 @@ deps = -r{toxinidir}/../requirements.txt
 commands=pycodestyle
 deps=pycodestyle
 
-[pycodestyle]
-exclude=
-  .tox,
-  migrations,
-  paperless/settings.py
+[testenv:doc]
+deps =
+  -r{toxinidir}/../requirements.txt
+  sphinx
+commands=sphinx-build -b html ../docs ../docs/_build -W

From 673b4cf9113e47ad8da074f1e68c17cf23fbd7f5 Mon Sep 17 00:00:00 2001
From: Ovv <contact@ovv.wtf>
Date: Tue, 27 Feb 2018 13:31:05 +0100
Subject: [PATCH 3/5] remove double python 3.6

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 59b2a7c5f..0b22d8037 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ matrix:
         - python: 3.4
         - python: 3.5
         - python: 3.6
-        - python: 3.6
 
 install:
     - pip install --requirement requirements.txt

From e5ebd84ecaf3cdc76f435a4fdddc28c7b7a3af62 Mon Sep 17 00:00:00 2001
From: Ovv <contact@ovv.wtf>
Date: Tue, 27 Feb 2018 13:37:01 +0100
Subject: [PATCH 4/5] travis doc path

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0b22d8037..e2c6acb51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ script:
     - cd src/
     - pytest --cov
     - pycodestyle
-    - sphinx-build -b html docs docs/_build -W
+    - sphinx-build -b html ../docs ../docs/_build -W
 
 after_success:
     - coveralls

From 40cb0190fc811d33727737aa8689d637c4e5bb51 Mon Sep 17 00:00:00 2001
From: Ovv <contact@ovv.wtf>
Date: Tue, 27 Feb 2018 13:44:18 +0100
Subject: [PATCH 5/5] Sphinx warning pngpath to imgpath

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index ec7ac4bdf..7cf8c9fe1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,7 +40,7 @@ def setup(app):
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
 ]