From cca2f6b664cf99e6077a61fa7e82901b507b0338 Mon Sep 17 00:00:00 2001 From: erlenmos <99336047+Erlendos12@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:27:29 +0100 Subject: [PATCH 1/6] Set minimal version of orix to >= 0.11.1 Version 0.11.1 includes a bug fix for where phases were losing information after refinement from single crystal map. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7bdd3579..6760a7e9 100644 --- a/setup.py +++ b/setup.py @@ -159,7 +159,7 @@ "matplotlib >= 3.3", "numba >= 0.55", "numpy >= 1.19", - "orix >= 0.11", + "orix >= 0.11.1", "pooch >= 0.13", "pyyaml", "tqdm >= 0.5.2", From 67daa3801e5d00527a5033d788c7c5a62cd99643 Mon Sep 17 00:00:00 2001 From: erlenmos <99336047+Erlendos12@users.noreply.github.com> Date: Tue, 14 Mar 2023 15:38:56 +0100 Subject: [PATCH 2/6] Mentioned new orix version 0.11.1 --- CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a9b6b121..fe432dd6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,14 @@ its best to adhere to `Semantic Versioning List entries are sorted in descending chronological order. Contributors to each release were listed in alphabetical order by first name until version 0.7.0. +0.8.2 (2023-03-14) +================== + +Changed +------- +- Set minimal version of orix to >= 0.11.1 + (`#623 `_) + 0.8.1 (2023-02-20) ================== From dc3bae8936465fe17e45d16426da64fb874a490e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Tue, 14 Mar 2023 16:13:24 +0100 Subject: [PATCH 3/6] Add @Erlendos12 to package credits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- .all-contributorsrc | 9 +++++++++ .zenodo.json | 4 ++++ README.md | 23 ++++++++++++++--------- kikuchipy/release.py | 1 + 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index f90afb4c..793014d9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -88,6 +88,15 @@ "contributions": [ "doc" ] + }, + { + "login": "Erlendos12", + "name": "erlenmos", + "avatar_url": "https://avatars.githubusercontent.com/u/99336047?v=4", + "profile": "https://github.com/Erlendos12", + "contributions": [ + "bug" + ] } ] } diff --git a/.zenodo.json b/.zenodo.json index 2e2c23c8..de384312 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -23,6 +23,10 @@ "name": "Zhou Xu", "affiliation": "Monash Centre for Electron Microscopy" }, + { + "name": "Erlend Mikkelsen Østvold", + "affiliation": "Norwegian University of Science and Technology" + }, { "name": "Magnus Nord", "orcid": "0000-0001-7981-5293", diff --git a/README.md b/README.md index 1d181071..8abf1493 100644 --- a/README.md +++ b/README.md @@ -58,15 +58,20 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - - - - + + + + + + + + + + + + + +

Eric Prestat
💻 🚧
Håkon Wiik Ånes

Lars Lervik
🐛 💻 📖 💬 👀 ⚠️
Magnus Nord
📖
Ole Natlandsmyr
💻 📖 💬 👀 ⚠️
Tina Bergh
💻 👀
Zhou Xu
🐛 💻 📖 ⚠️
Eric Prestat
Eric Prestat
💻 🚧		Håkon Wiik Ånes
Håkon Wiik Ånes
Lars Lervik
Lars Lervik
🐛 💻 📖 💬 👀 ⚠️		Magnus Nord
Magnus Nord
📖		Ole Natlandsmyr
Ole Natlandsmyr
💻 📖 💬 👀 ⚠️		Tina Bergh
Tina Bergh
💻 👀		Zhou Xu
Zhou Xu
🐛 💻 📖 ⚠️
erlenmos
erlenmos
🐛
diff --git a/kikuchipy/release.py b/kikuchipy/release.py index 6ff96e45..e7b0f443 100644 --- a/kikuchipy/release.py +++ b/kikuchipy/release.py @@ -28,6 +28,7 @@ "Tina Bergh", "Eric Prestat", "Zhou Xu", + "Erlend Mikkelsen Østvold", "Magnus Nord", ] license = "GPLv3+" From cf1f952427df2f33d7397cfc69f9af154be53106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Tue, 14 Mar 2023 16:13:54 +0100 Subject: [PATCH 4/6] Update doc dependencies following fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- CHANGELOG.rst | 2 +- setup.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fe432dd6..00266a3c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,7 +18,7 @@ were listed in alphabetical order by first name until version 0.7.0. Changed ------- -- Set minimal version of orix to >= 0.11.1 +- Set minimal version of orix to >= 0.11.1. (`#623 `_) 0.8.1 (2023-02-20) diff --git a/setup.py b/setup.py index 6760a7e9..69d46ef8 100644 --- a/setup.py +++ b/setup.py @@ -43,8 +43,6 @@ # fmt: off extra_feature_requirements = { "doc": [ - # TODO: Remove once https://github.com/pyxem/kikuchipy/issues/566 is resolved - "ipywidgets <= 7.7.1", "memory_profiler", "nbsphinx >= 0.7", "numpydoc", @@ -57,7 +55,7 @@ "sphinx-codeautolink[ipython] < 0.14", "sphinx-copybutton >= 0.2.5", "sphinx-design", - "sphinx-gallery < 0.11", + "sphinx-gallery", "sphinxcontrib-bibtex >= 1.0", ], "tests": [ From 195cdc6c5a22f655b1f7bb65808355bcf7344237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Tue, 14 Mar 2023 16:15:21 +0100 Subject: [PATCH 5/6] Run minimal dep. tests with orix 0.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 33bf737a..fc1b8336 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -61,7 +61,7 @@ jobs: include: - os: ubuntu-latest python-version: 3.7 - DEPENDENCIES: dask==2021.8.1 diffsims==0.5.0 hyperspy==1.7.3 matplotlib==3.3 numba==0.55 numpy==1.19 orix==0.11.0 scikit-image==0.16.2 + DEPENDENCIES: dask==2021.8.1 diffsims==0.5.0 hyperspy==1.7.3 matplotlib==3.3 numba==0.55 numpy==1.19 orix==0.11.1 scikit-image==0.16.2 LABEL: -oldest - os: ubuntu-latest python-version: 3.10 From 9963f210fdf4eb89fa993df396518041a27974d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Tue, 14 Mar 2023 16:15:38 +0100 Subject: [PATCH 6/6] Bump version to 0.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- kikuchipy/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kikuchipy/release.py b/kikuchipy/release.py index e7b0f443..914e0f8f 100644 --- a/kikuchipy/release.py +++ b/kikuchipy/release.py @@ -37,4 +37,4 @@ name = "kikuchipy" platforms = ["Linux", "MacOS X", "Windows"] status = "Development" -version = "0.8.1" +version = "0.8.2"