Fix make targets and .gitignore

.github/workflows/documentation.yml

@@ -39,13 +39,12 @@ jobs:
       - name: Install Package
         run: |
           python -m pip install ".[doc]"
-          python -m pip install -r requirements/doc.txt
 
       - name: Build docs
         run: |
-          make render
+          make doc
 
       - name: Deploy to Github Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: _site
+          folder: qdoc/_site

.gitignore

@@ -85,3 +85,12 @@ benchmarks
 
 # version file generated by setuptools-scm
 plotnine/_version.py
+
+# Documentation
+qdoc/plotnine-examples
+qdoc/reference/
+qdoc/_site/
+qdoc/.quarto/
+qdoc/gallery/thumbnails
+qdoc/objects.json
+qdoc/.luarc.json

Makefile

@@ -68,15 +68,10 @@ coverage:
 	coverage html
 	$(BROWSER) htmlcov/index.html
 
-# doc:
-# 	$(MAKE) -C doc clean
-# 	$(MAKE) -C doc html
-# 	$(BROWSER) doc/_build/html/index.html
-
 doc:
-	$(MAKE) -C qdoc doc
+	$(MAKE) -C qdoc render
 
-qdoc-preview:
+doc-preview:
 	$(MAKE) -C qdoc preview
 
 release: clean

pyproject.toml

@@ -55,6 +55,7 @@ doc = [
     "click",
     "numpydoc>=0.9.1",
     "sphinx>=6.1.0",
+    "quartodoc",
     "pyyaml",
     # Use importlib.resources when min supported python >= 3.9.0
     "importlib_resources",

qdoc/.gitignore

@@ -1,7 +1 @@
-plotnine-examples
-reference/
-_site/
-.quarto/
-gallery/thumbnails
-objects.json
-.luarc.json
+/.quarto/

qdoc/Makefile

@@ -2,9 +2,11 @@ setup:
 	rm -rf plotnine-examples
 	git clone https://github.com/has2k1/plotnine-examples.git
 
-doc:
+render:
 	DOC_GENERATION=1 python -m quartodoc build
 	quarto render
 
+doc: render
+
 preview:
 	quarto preview