diffpy · cadenmyers13 · May 20, 2024 · May 21, 2024 · May 23, 2024 · May 23, 2024
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,10 @@ on:
       - main
   release:
 
+  pull_request:
+    branches:
+      - main
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -37,6 +41,7 @@ jobs:
         run: make -C doc/manual html
 
       - name: Deploy
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/docs/Makefile → doc/manual/Makefile b/docs/Makefile → doc/manual/Makefile
diff --git a/docs/examples/zro2_mo.xy → doc/manual/examples/zro2_mo.xy b/docs/examples/zro2_mo.xy → doc/manual/examples/zro2_mo.xy
diff --git a/docs/make.bat → doc/manual/make.bat b/docs/make.bat → doc/manual/make.bat
diff --git a/docs/source/_static/.placeholder → doc/manual/source/_static/.placeholder b/docs/source/_static/.placeholder → doc/manual/source/_static/.placeholder
diff --git a/docs/source/conf.py → doc/manual/source/conf.py b/docs/source/conf.py → doc/manual/source/conf.py
@@ -31,6 +31,11 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
+
+import sphinx_rtd_theme
+
+import diffpy.labpdfproc
+
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
@@ -75,7 +80,6 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-import diffpy.labpdfproc
 
 # The short X.Y version.
 version = diffpy.labpdfproc.__version__
@@ -107,7 +111,6 @@
 # a list of builtin themes.
 #
 html_theme = "sphinx_rtd_theme"
-import sphinx_rtd_theme
 
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 

diff --git a/docs/source/index.rst → doc/manual/source/index.rst b/docs/source/index.rst → doc/manual/source/index.rst
diff --git a/docs/source/installation.rst → doc/manual/source/installation.rst b/docs/source/installation.rst → doc/manual/source/installation.rst
diff --git a/docs/source/min_versions.rst → doc/manual/source/min_versions.rst b/docs/source/min_versions.rst → doc/manual/source/min_versions.rst
diff --git a/docs/source/release-history.rst → doc/manual/source/release-history.rst b/docs/source/release-history.rst → doc/manual/source/release-history.rst
diff --git a/docs/source/usage.rst → doc/manual/source/usage.rst b/docs/source/usage.rst → doc/manual/source/usage.rst
diff --git a/prevent_commit_to_main.sh b/prevent_commit_to_main.sh
diff --git a/requirements/build.txt b/requirements/build.txt
@@ -0,0 +1,2 @@
+python
+setuptools
diff --git a/requirements/run.txt b/requirements/run.txt
@@ -0,0 +1,5 @@
+numpy
+scipy
+diffpy.utils
+matplotlib
+bg-mpl-stylesheets