From 4bf22ad70b4c8def77ecf1fe29e014e47a4069cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Wiik=20A=CC=8Anes?= Date: Sun, 21 Apr 2024 12:04:28 +0200 Subject: [PATCH 1/4] Remove Sphinx-gallery execution time file when calling "make clean" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- doc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Makefile b/doc/Makefile index bd1704b9..ab377f87 100644 --- 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). From 841c6940c7b84f35295bd8ffcad7c4f750fb38a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Wiik=20A=CC=8Anes?= Date: Sun, 21 Apr 2024 12:04:54 +0200 Subject: [PATCH 2/4] Pin nbconvert < 7.14 to temporarily fix tqdm progressbar/nbsphinx issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 320fc299..e5a3f54e 100644 --- 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", From 164c65e62c427a7da6e89c1d95a9f613669fd442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Wiik=20A=CC=8Anes?= Date: Sun, 21 Apr 2024 12:23:34 +0200 Subject: [PATCH 3/4] Set version to 0.12.1.post0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- orix/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orix/__init__.py b/orix/__init__.py index c24b46a4..71569379 100644 --- a/orix/__init__.py +++ b/orix/__init__.py @@ -1,5 +1,5 @@ __name__ = "orix" -__version__ = "0.12.1" +__version__ = "0.12.1.post0" __author__ = "orix developers" __author_email__ = "pyxem.team@gmail.com" __description__ = "orix is an open-source Python library for handling crystal orientation mapping data." From 5271d014cbec13df79fe2b7eedb0d9029a150360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Wiik=20A=CC=8Anes?= Date: Sun, 21 Apr 2024 12:31:42 +0200 Subject: [PATCH 4/4] Re-enable PDF build on RTD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs.yaml b/readthedocs.yaml index d79c568b..80b8e401 100644 --- a/readthedocs.yaml +++ b/readthedocs.yaml @@ -20,7 +20,7 @@ build: # Doc formats formats: - htmlzip -# - pdf + - pdf conda: environment: doc/environment.yml