Merge branch 'main' into pdnagraph

docs/Makefile

@@ -12,23 +12,18 @@ BUILDDIR      = _build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+
+.PHONY: help Makefile generate-rst
+
+# Custom target to generate rst files
+generate-rst:
+	@echo "Generating custom rst files..."
+	@python ../scripts/w_g_comparison.py
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@rsync -r --exclude '.ipynb_checkpoints/' ../notebooks/ ./notebooks/
+%: Makefile generate-rst
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-github:
-	@make html
 
-sync:
-	@rsync -avh _build/html/ ../docs/ --delete
-	@make clean
-	touch .nojekyll
 
-clean:
-	rm -rf $(BUILDDIR)/*
-	rm -rf auto_examples/
-	rm -rf generated/

docs/conf.py

@@ -160,7 +160,7 @@
     "navbar_links": [
         # ("Gallery", "auto_examples/index"),
         ("Installation", "installation"),
-        ("Tutorial", "tutorial"),
+        ("User Guide", "user-guide/intro"),
         ("API", "api"),
         ("References", "references"),
     ],

docs/index.rst

@@ -19,7 +19,7 @@ libpysal: Python Spatial Analysis Library Core
         <div class="col-sm-1 col-xs-hidden">
         </div>
         <div class="col-sm-10 col-xs-12">
-            <a href="http://nbviewer.jupyter.org/github/pysal/libpysal/blob/main/notebooks/weights.ipynb" class="thumbnail">
+            <a href="http://nbviewer.jupyter.org/github/pysal/libpysal/blob/main/docs/user-guide/weights/weights.ipynb" class="thumbnail">
                 <img src="_static/images/npweights.png" class="img-responsive center-block">
                 <div class="caption text-center">
                 <h6>Weights for nonplanar enforced geometries</h6>
@@ -35,14 +35,24 @@ libpysal: Python Spatial Analysis Library Core
 Introduction
 ************
 
-**libpysal** offers four modules that form the building blocks in many upstream packages in the `PySAL family <https://pysal.org>`_:
+**libpysal** offers five modules that form the building blocks in many upstream packages in the `PySAL family <https://pysal.org>`_:
 
-- Spatial Weights: libpysal.weights
+- Spatial Weights: libpysal.weights 
+- Spatial Graphs: libpysal.graph 
 - Input-and output: libpysal.io
 - Computational geometry: libpysal.cg
 - Built-in example datasets libpysal.examples
 
-Examples demonstrating some of **libpysal** functionality are available in the `tutorial <tutorial.html>`_.
+
+.. Note:: A new Graph class is being added to libpysal. For users interested in
+	  migration from using Weights to the new Graph class, see the
+	  `migration guide <user-guide/graph/w_g_migration.html>`_. For
+	  developers interested in the technical details details see   `W and Graph Components <migration.html>`_.
+
+
+
+Examples demonstrating some of **libpysal** functionality are available in the
+`User Guide <user-guide.html>`_.
 
 Details are available in the `libpysal api <api.html>`_.
 
@@ -111,14 +121,15 @@ libpysal
 
 Core components of the Python Spatial Analysis Library (`PySAL`_)
 
+Documentation contents
+----------------------
 .. toctree::
-   :hidden:
-   :maxdepth: 4
-   :caption: Contents:
-
-   Installation <installation>
-   Tutorial <tutorial>
-   API <api>
-   References <references>
-
+   :maxdepth: 1
+
+   Home <self>
+   API reference <api>
+   references
+   user-guide/intro
+
+
 .. _PySAL: https://github.com/pysal/pysal