merged

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     hooks:
     - id: flake8
 -   repo: https://gitlab.com/dboe/dough
-    rev: v0.1.3
+    rev: v0.1.10
     hooks:
     - id: readthedocs_requirements
 -   repo: https://github.com/pre-commit/pre-commit-hooks 
@@ -17,6 +17,7 @@ repos:
     hooks:
     - id: check-json
     - id: pretty-format-json
+      args: ['--indent', '4']
     - id: check-merge-conflict
     - id: check-toml
     - id: check-yaml

.readthedocs.yml

@@ -5,6 +5,12 @@
 # Required
 version: 2
 
+
+formats: all
+
+build:
+  image: latest
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
@@ -14,3 +20,7 @@ python:
   version: 3.7
   install:
     - requirements: docs/requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

Makefile

@@ -73,11 +73,7 @@ update:
 	  	echo "Your status is not clean! I can not update!"; \
 	    exit 1; \
 	fi
-	# Uninstall pre-commit
-	pre-commit uninstall
 	# Starting upgrade
 	cookiecutter_project_upgrader
-	# Install pre-commit again
-	pre-commit install
 
 FORCE: ;

docs/conf.py

@@ -30,8 +30,7 @@ source_dir = config["build_sphinx"]["source-dir"]
 # -- General configuration ---------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
+needs_sphinx = "2.2.0"
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.

setup.cfg

@@ -54,25 +54,29 @@ exclude =
     performance*
 
 [options.extras_require]
-all = 
-	%(dev)s
-dev = 
-	%(test)s
+all =
+    %(dev)s
+dev =
+	%(docs)s
+    %(test)s
 	bumpversion  # for incrementing the version
 	twine  # for publishing
 	sphinx  # for documentation
 	pre-commit  # https://pre-commit.com/ for hook managment
 	pre-commit-hooks
-	cookiecutter_project_upgrader
-test = 
-	flake8
-	pytest
-	pytest-cov
-	coverage
-	pytest-shutil
-	pytest-virtualenv
-	pytest-fixture-config
-	pytest-xdist
+    cookiecutter_project_upgrader
+docs =
+    sphinx>=2.2.0  # requires templatedir option in sphinx-apidoc
+    sphinx_rtd_theme>=0.4.3
+test =
+    flake8
+    pytest
+    pytest-cov
+    coverage
+    pytest-shutil
+    pytest-virtualenv
+    pytest-fixture-config
+    pytest-xdist
 
     matplotlib