diffpy · cadenmyers13 · May 20, 2024 · May 21, 2024 · May 22, 2024 · May 22, 2024
diff --git a/.flake8 b/.flake8
@@ -6,7 +6,7 @@ exclude =
     dist,
     versioneer.py,
     labpdfproc/_version.py,
-    docs/source/conf.py
+    doc/manual/source/conf.py
 max-line-length = 115
 # Ignore some style 'errors' produced while formatting by 'black'
 ignore = E203, W503
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,11 @@ on:
       - main
   release:
 
+# Documentation built but not deployed for pull requests
+  pull_request:
+    branches:
+      - main
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -37,6 +42,8 @@ jobs:
         run: make -C doc/manual html
 
       - name: Deploy
+      # Documentation deployed only on pushes to main and releases
+        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
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