Skip to content

Commit

Permalink
Increase minimal versions of diffsims, NumPy and Matplotlib
Browse files Browse the repository at this point in the history
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
  • Loading branch information
hakonanes committed Jul 24, 2023
1 parent 462f973 commit 565c430
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -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.1 pooch==1.3.0 scikit-image==0.16.2
DEPENDENCIES: dask==2021.8.1 diffsims==0.5.1 hyperspy==1.7.3 matplotlib==3.5 numba==0.55 numpy==1.21.6 orix==0.11.1 pooch==1.3.0 scikit-image==0.16.2
LABEL: -oldest
- os: ubuntu-latest
python-version: 3.11
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -28,6 +28,8 @@ Changed
internally to set the default color to white anymore, but uses ``fc`` (facecolor)
instead. This change was necessary to improve handling of other keyword arguments.
(`#643 <https://github.com/pyxem/kikuchipy/pull/643>`_)
- Increase minimal versions of diffsims, NumPy, and Matplotlib to 0.5.1, 1.21.6, and
3.5 respectively. (`#645 <https://github.com/pyxem/kikuchipy/pull/645>`_)

Deprecated
----------
Expand Down
6 changes: 0 additions & 6 deletions doc/conf.py
Expand Up @@ -351,9 +351,3 @@ def _str_examples(self):
print("[kikuchipy] Downloading example datasets (if not found in cache)")
_ = kp.data.nickel_ebsd_large(allow_download=True)
_ = kp.data.si_ebsd_moving_screen(0, allow_download=True)


def setup(app):
# Ignore .ipynb and .html files (see https://github.com/executablebooks/MyST-NB/issues/363).
app.registry.source_suffix.pop(".ipynb", None)
app.registry.source_suffix.pop(".html", None)
16 changes: 8 additions & 8 deletions doc/user/applications.rst
Expand Up @@ -21,13 +21,13 @@ Most of these works are also listed when searching for ``"kikuchipy"`` `on Googl
- O. W. Sandvik, A. M. Müller, H. W. Ånes, M. Zahn, J. He, M. Fiebig, T. Lottermoser,
Th. Rojac, D. Meier and J. Schultheiß, "Pressure Control of Nonferroelastic
Ferroelectric Domains in ErMnO3," *Nano Letters* (2023).
https://doi.org/10.1021/acs.nanolett.3c01638.
(`arXiv <https://doi.org/10.48550/arXiv.2304.08423>`__.)
https://doi.org/10.1021/acs.nanolett.3c01638
(`arXiv <https://doi.org/10.48550/arXiv.2304.08423>`__).
- H. W. Ånes, A. T. J. van Helvoort and K. Marthinsen, "Orientation dependent pinning
of (sub)grains by dispersoids during recovery and recrystallization in an Al-Mn
alloy," *Acta Materialia* **248** (2023).
https://doi.org/10.1016/j.actamat.2023.118761.
(`arXiv <https://doi.org/10.48550/arxiv.2212.03527>`__.)
https://doi.org/10.1016/j.actamat.2023.118761
(`arXiv <https://doi.org/10.48550/arxiv.2212.03527>`__).
- T. Bergh, H. W. Ånes, R. Aune, S. Wenner, R. Holmestad, X. Ren and P. E. Vullum,
"Intermetallic Phase Layers in Cold Metal Transfer Aluminium-Steel Welds with an
Al-Si–Mn Filler Alloy," *Materials Transactions* **64(2)** (2023).
Expand All @@ -42,13 +42,13 @@ Most of these works are also listed when searching for ``"kikuchipy"`` `on Googl
- H. W. Ånes, A. T. J. van Helvoort and K. Marthinsen, "Correlated subgrain and
particle analysis of a recovered Al-Mn alloy by directly combining EBSD and
backscatter electron imaging," *Materials Characterization* **193** (2022).
https://doi.org/10.1016/j.matchar.2022.112228.
(`arXiv <https://doi.org/10.48550/arXiv.2205.05514>`__.)
https://doi.org/10.1016/j.matchar.2022.112228
(`arXiv <https://doi.org/10.48550/arXiv.2205.05514>`__).
- J. Schultheiß, F. Xue, E. Roede, H. W. Ånes, F. H. Danmo, S. M. Selbach, L.-Q. Chen
and D. Meier, "Confinement-driven inverse domain scaling in polycrystalline ErMnO3,"
*Advanced Materials*, **34** (2022).
https://doi.org/10.1002/adma.202203449.
(`arXiv <https://doi.org/10.48550/arxiv.2204.07979>`__.)
https://doi.org/10.1002/adma.202203449
(`arXiv <https://doi.org/10.48550/arxiv.2204.07979>`__).

2021
====
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -146,13 +146,13 @@
install_requires=[
"dask[array] >= 2021.8.1",
"diffpy.structure >= 3",
"diffsims >= 0.5",
"diffsims >= 0.5.1",
"hyperspy >= 1.7.3",
"h5py >= 2.10",
"imageio",
"matplotlib >= 3.3",
"matplotlib >= 3.5",
"numba >= 0.55",
"numpy >= 1.19",
"numpy >= 1.21.6",
"orix >= 0.11.1",
"pooch >= 1.3.0",
"pyyaml",
Expand Down

0 comments on commit 565c430

Please sign in to comment.