From b6a86f5d0fadee254170f0b7da4ac59d6a8736ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Mon, 24 Jul 2023 08:22:37 -0700 Subject: [PATCH 1/2] Update contributor order (per line additions) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- .zenodo.json | 8 ++++---- kikuchipy/release.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index de384312..513c7801 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -19,14 +19,14 @@ { "name": "Eric Prestat" }, - { - "name": "Zhou Xu", - "affiliation": "Monash Centre for Electron Microscopy" - }, { "name": "Erlend Mikkelsen Østvold", "affiliation": "Norwegian University of Science and Technology" }, + { + "name": "Zhou Xu", + "affiliation": "Monash Centre for Electron Microscopy" + }, { "name": "Magnus Nord", "orcid": "0000-0001-7981-5293", diff --git a/kikuchipy/release.py b/kikuchipy/release.py index c94bab6d..7e9420e6 100644 --- a/kikuchipy/release.py +++ b/kikuchipy/release.py @@ -27,8 +27,8 @@ "Ole Natlandsmyr", "Tina Bergh", "Eric Prestat", - "Zhou Xu", "Erlend Mikkelsen Østvold", + "Zhou Xu", "Magnus Nord", ] license = "GPLv3+" From 309d9204001139a8f5f3212273ecb0fe8dd75e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Mon, 24 Jul 2023 08:47:37 -0700 Subject: [PATCH 2/2] Fix Sphinx use in release guide and fix some links in docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- RELEASE.rst | 2 +- doc/tutorials/geometrical_ebsd_simulations.ipynb | 4 ++-- doc/tutorials/hough_indexing.ipynb | 2 +- doc/tutorials/hybrid_indexing.ipynb | 2 +- doc/tutorials/pc_calibration_moving_screen_technique.ipynb | 4 ++-- doc/tutorials/pc_extrapolate_plane.ipynb | 4 ++-- doc/tutorials/pc_fit_plane.ipynb | 4 ++-- doc/tutorials/pc_orientation_dependence.ipynb | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RELEASE.rst b/RELEASE.rst index 3fff9b28..8f09405a 100644 --- a/RELEASE.rst +++ b/RELEASE.rst @@ -19,7 +19,7 @@ Preparation - Run tutorial notebooks and examples in the documentation locally and confirm that they produce the expected results. - From time to time, check the documentation links (``make linkchecker``) and fix any + From time to time, check the documentation links (``make linkcheck``) and fix any broken ones. - Review the contributor list ``__credits__`` in ``kikuchipy/release.py`` to ensure all diff --git a/doc/tutorials/geometrical_ebsd_simulations.ipynb b/doc/tutorials/geometrical_ebsd_simulations.ipynb index 6f2aaf78..022f5463 100644 --- a/doc/tutorials/geometrical_ebsd_simulations.ipynb +++ b/doc/tutorials/geometrical_ebsd_simulations.ipynb @@ -143,7 +143,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "We'll build up the reflector list using [diffsims.crystallography.ReciprocalLatticeVector](https://diffsims.readthedocs.io/en/latest/reference.html#diffsims.crystallography.ReciprocalLatticeVector)" + "We'll build up the reflector list using [diffsims.crystallography.ReciprocalLatticeVector](https://diffsims.readthedocs.io/en/latest/reference/generated/diffsims.crystallography.ReciprocalLatticeVector.html)" ] }, { @@ -479,7 +479,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.9" + "version": "3.11.4" } }, "nbformat": 4, diff --git a/doc/tutorials/hough_indexing.ipynb b/doc/tutorials/hough_indexing.ipynb index 994e6c9e..75096b42 100644 --- a/doc/tutorials/hough_indexing.ipynb +++ b/doc/tutorials/hough_indexing.ipynb @@ -26,7 +26,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", diff --git a/doc/tutorials/hybrid_indexing.ipynb b/doc/tutorials/hybrid_indexing.ipynb index 1d5e8811..ccf8400b 100644 --- a/doc/tutorials/hybrid_indexing.ipynb +++ b/doc/tutorials/hybrid_indexing.ipynb @@ -397,7 +397,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", diff --git a/doc/tutorials/pc_calibration_moving_screen_technique.ipynb b/doc/tutorials/pc_calibration_moving_screen_technique.ipynb index 780c7148..e24dd4eb 100644 --- a/doc/tutorials/pc_calibration_moving_screen_technique.ipynb +++ b/doc/tutorials/pc_calibration_moving_screen_technique.ipynb @@ -242,7 +242,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", @@ -409,7 +409,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.9" + "version": "3.11.4" } }, "nbformat": 4, diff --git a/doc/tutorials/pc_extrapolate_plane.ipynb b/doc/tutorials/pc_extrapolate_plane.ipynb index ad9593bc..36ee40ac 100644 --- a/doc/tutorials/pc_extrapolate_plane.ipynb +++ b/doc/tutorials/pc_extrapolate_plane.ipynb @@ -266,7 +266,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", @@ -1309,7 +1309,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.10" + "version": "3.11.4" } }, "nbformat": 4, diff --git a/doc/tutorials/pc_fit_plane.ipynb b/doc/tutorials/pc_fit_plane.ipynb index 689c4939..fc31865c 100644 --- a/doc/tutorials/pc_fit_plane.ipynb +++ b/doc/tutorials/pc_fit_plane.ipynb @@ -575,7 +575,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", @@ -1395,7 +1395,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.10" + "version": "3.11.4" } }, "nbformat": 4, diff --git a/doc/tutorials/pc_orientation_dependence.ipynb b/doc/tutorials/pc_orientation_dependence.ipynb index cee2d4f8..c636839b 100644 --- a/doc/tutorials/pc_orientation_dependence.ipynb +++ b/doc/tutorials/pc_orientation_dependence.ipynb @@ -527,7 +527,7 @@ "Note\n", "\n", "PyEBSDIndex is an optional dependency of kikuchipy, and can be installed with both `pip` and `conda` (from `conda-forge`).\n", - "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/installation.html).\n", + "To install PyEBSDIndex, see their [installation instructions](https://pyebsdindex.readthedocs.io/en/latest/user/installation.html).\n", "\n", "PyEBSDIndex supports indexing face centered and body centered cubic (FCC and BCC) materials.\n", "\n", @@ -1640,7 +1640,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.10" + "version": "3.11.4" } }, "nbformat": 4,