Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main into develop after 0.13.1 #524

Merged
merged 8 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Håkon Wiik Ånes",
"orcid": "0000-0002-1213-2911",
"affiliation": "Norwegian University of Science and Technology"
"affiliation": "Xnovo Technology ApS"
},
{
"name": "Ben Martineau"
Expand Down
21 changes: 18 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,31 @@ Unreleased

Added
-----
- Support for Python 3.12.

Changed
-------
- numpy-quaternion is now an optional dependency and will not be installed with ``pip``
unless ``pip install orix[all]`` is used.

Removed
-------

Deprecated
----------

Fixed
-----

2024-09-20 - version 0.13.1
===========================

Added
-----
- Support for Python 3.12.

Changed
-------
- numpy-quaternion is now an optional dependency and will not be installed with ``pip``
unless ``pip install orix[all]`` is used.

Removed
-------
- Support for Python 3.8 and 3.9.
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ orix is released under the GPL v3 license.
.. |build_status| image:: https://github.com/pyxem/orix/workflows/build/badge.svg
:target: https://github.com/pyxem/orix/actions/workflows/build.yml

.. |python| image:: https://img.shields.io/badge/python-3.8+-blue.svg
.. |python| image:: https://img.shields.io/badge/python-3.10+-blue.svg
:target: https://www.python.org/downloads/

.. |Coveralls| image:: https://coveralls.io/repos/github/pyxem/orix/badge.svg?branch=develop
Expand Down
4 changes: 2 additions & 2 deletions doc/tutorials/crystal_map.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@
" vmax=angles.max() - 10,\n",
" overlay=xmap.iq,\n",
" colorbar=True,\n",
" colorbar_label=\"Rotation angle, $\\omega$ [$^{\\circ}$]\",\n",
" colorbar_label=r\"Rotation angle, $\\omega$ [$\\degree$]\",\n",
")"
]
},
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.6"
"version": "3.12.6"
}
},
"nbformat": 4,
Expand Down
10 changes: 5 additions & 5 deletions doc/tutorials/pole_density_function.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,19 @@
"v = Vector3d.random(1_000_000)\n",
"\n",
"ax[0].pole_density_function(v, log=False, resolution=1)\n",
"ax[0].set(title=\"Sampling resolution: 1$\\degree$\")\n",
"ax[0].set(title=r\"Sampling resolution: 1$\\degree$\")\n",
"\n",
"# change sampling resolution on S2\n",
"ax[1].pole_density_function(v, log=False, resolution=5)\n",
"ax[1].set(title=\"Sampling resolution: 5$\\degree$\")\n",
"ax[1].set(title=r\"Sampling resolution: 5$\\degree$\")\n",
"\n",
"# increase peak broadening\n",
"ax[2].pole_density_function(v, log=False, resolution=1, sigma=15)\n",
"ax[2].set(title=\"Sampling resolution: 1$\\degree$\\n$\\sigma$: 15$\\degree$\")\n",
"ax[2].set(title=\"Sampling resolution: 1$\\\\degree$\\n$\\\\sigma$: 15$\\\\degree$\")\n",
"\n",
"# change colormap\n",
"ax[3].pole_density_function(v, log=False, resolution=1, cmap=\"gray_r\")\n",
"ax[3].set(title='Sampling resolution: 1$\\degree$\\ncmap: \"gray_r\"')\n",
"ax[3].set(title=\"Sampling resolution: 1$\\\\degree$\\ncmap: 'gray_r'\")\n",
"\n",
"for a in ax:\n",
" a.set_labels(\"X\", \"Y\", None)"
Expand Down Expand Up @@ -352,7 +352,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.6"
"version": "3.12.6"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion examples/plotting/interactive_xmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def on_click(event):
plt.imshow(rgb_dp_2d)
plt.plot(x, y, "+", c="k", markersize=15, markeredgewidth=3)
plt.title(
f"Phase: {phase_name}, Euler angles: $(\phi_1, \Phi, \phi_2)$ = {eu_str}"
rf"Phase: {phase_name}, Euler angles: $(\phi_1, \Phi, \phi_2)$ = {eu_str}"
)
plt.draw()

Expand Down
4 changes: 2 additions & 2 deletions examples/rotations/rotating_z_to_high_symmetry_directions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
r"""
=====================================================
Rotating z-vector to high-symmetry crystal directions
=====================================================
Expand Down Expand Up @@ -26,7 +26,7 @@

from orix.crystal_map import Phase
from orix.quaternion import Rotation
from orix.vector import Miller, Vector3d
from orix.vector import Miller

phase = Phase(point_group="mmm")
t = Miller.from_highest_indices(phase, uvw=[1, 1, 1])
Expand Down
2 changes: 1 addition & 1 deletion examples/rotations/rotations_mapping_fundamental_sector.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
r"""
================================================
Rotations mapping the fundamental sector on *S2*
================================================
Expand Down
2 changes: 1 addition & 1 deletion orix/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.14.dev0"
__version__ = "0.14.dev1"
# Sorted by line contributions (ideally excluding lines in notebook files)
__credits__ = [
"Håkon Wiik Ånes",
Expand Down
Loading