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

Bring changes in main into develop after 0.11.1 release #436

Merged

Conversation

hakonanes
Copy link
Member

Description of the change

This routine PR brings all changes in main into develop after the recent 0.11.1 release, reverts the release version to 0.12.dev0 and adds the "Unreleased" section to the changelog.

Progress of the PR

For reviewers

  • The PR title is short, concise, and will make sense 1 year later.
  • New functions are imported in corresponding __init__.py.
  • New features, API changes, and deprecations are mentioned in the unreleased
    section in CHANGELOG.rst.
  • Contributor(s) are listed correctly in __credits__ in orix/__init__.py and in
    .zenodo.json.

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
…elist

Fix phase list when initializing CrystalMap with a sparse phase list
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes hakonanes added the dev Package maintenance label Mar 14, 2023
@hakonanes hakonanes added this to the v0.12.0 milestone Mar 14, 2023
@hakonanes
Copy link
Member Author

The changes on main are already reviewed, will merge myself.

@hakonanes hakonanes merged commit b0226d2 into pyxem:develop Mar 14, 2023
@hakonanes hakonanes deleted the main-into-develop-post-0.11.1-release branch March 14, 2023 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dev Package maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant