Merge 9a2059b into dc086d7

fugue-project · May 18, 2020 · 76b7bcd · 76b7bcd
2 parents dc086d7 + 9a2059b
commit 76b7bcd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -17,9 +17,10 @@ dev:
 	pip3 install -r requirements.txt
 
 docs:
-	rm -rf docs/source/api
-	sphinx-apidoc --no-toc -f -t=docs/source/_templates -o docs/source/api triad/
-	sphinx-build -M html docs/source/ docs/build/
+	rm -rf docs/api
+	rm -rf docs/build
+	sphinx-apidoc --no-toc -f -t=docs/_templates -o docs/api triad/
+	sphinx-build -M html docs/ docs/build/
 
 lint:
 	pre-commit run --all-files

diff --git a/docs/source/_templates/package.rst_t → docs/_templates/package.rst_t b/docs/source/_templates/package.rst_t → docs/_templates/package.rst_t
diff --git a/docs/source/_templates/toc.rst_t → docs/_templates/toc.rst_t b/docs/source/_templates/toc.rst_t → docs/_templates/toc.rst_t
diff --git a/docs/source/api/triad.collections.rst → docs/api/triad.collections.rst b/docs/source/api/triad.collections.rst → docs/api/triad.collections.rst
@@ -1,4 +1,4 @@
-triad.collections
+triad.collections 
 ==================
 
 
@@ -17,3 +17,4 @@ triad.collections.schema
    :members:
    :undoc-members:
    :show-inheritance:
+
diff --git a/docs/source/api/triad.rst → docs/api/triad.rst b/docs/source/api/triad.rst → docs/api/triad.rst
@@ -1,4 +1,4 @@
-triad
+triad 
 ======
 
 .. toctree::
@@ -23,3 +23,4 @@ triad.exceptions
    :members:
    :undoc-members:
    :show-inheritance:
+
diff --git a/docs/source/api/triad.utils.rst → docs/api/triad.utils.rst b/docs/source/api/triad.utils.rst → docs/api/triad.utils.rst
@@ -1,4 +1,4 @@
-triad.utils
+triad.utils 
 ============
 
 
@@ -65,3 +65,4 @@ triad.utils.string
    :members:
    :undoc-members:
    :show-inheritance:
+
diff --git a/docs/source/conf.py → docs/conf.py b/docs/source/conf.py → docs/conf.py
diff --git a/docs/source/index.rst → docs/index.rst b/docs/source/index.rst → docs/index.rst