Merge pull request #497 from hakonanes/main-into-develop-after-0.12.1…

….post0 Self-merging as all commits have already been reviewed elsewhere.
pyxem · Apr 25, 2024 · c9b65c8 · c9b65c8
2 parents 5331127 + 45fe426
commit c9b65c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/doc/Makefile b/doc/Makefile
@@ -18,6 +18,7 @@ clean:
 	rm -rf $(BUILDDIR)
 	rm -rf $(SOURCEDIR)/examples
 	rm -rf $(SOURCEDIR)/reference/generated
+	rm sg_execution_times.rst
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

diff --git a/readthedocs.yaml b/readthedocs.yaml
@@ -20,7 +20,7 @@ build:
 # Doc formats
 formats:
   - htmlzip
-#  - pdf
+  - pdf
 
 conda:
   environment: doc/environment.yml

diff --git a/setup.py b/setup.py
@@ -12,6 +12,9 @@
     "doc": [
         "ipykernel",  # Used by nbsphinx to execute notebooks
         "memory_profiler",
+        # TODO: Remove nbconvert pin once
+        #  https://github.com/pyxem/orix/issues/494 is resolved
+        "nbconvert                      < 7.14",
         "nbsphinx                       >= 0.7",
         "numpydoc",
         "pydata-sphinx-theme",
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ build: @@
     # Doc formats
     formats:
       - htmlzip
-    #  - pdf
+      - pdf
     conda:
       environment: doc/environment.yml
@@ Expand Down @@