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.

Sign up for GitHub

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

Jump to bottom

Prepare main branch for 0.13.0 release #511

Merged
merged 58 commits into from
Sep 3, 2024
Merged

Prepare main branch for 0.13.0 release #511

merged 58 commits into from
Sep 3, 2024

Conversation

hakonanes
Copy link
Member

This PR prepares the main branch for cutting a 0.13.0 release by bringing all changes from develop.

Notable changes not in develop:

IMBalENce and others added 30 commits March 26, 2024 10:33
@IMBalENce @CSSFrancis
Add ctf file reader and interactive IPF example
3be235e 
Signed-off-by: IMBalENce <[email protected]>
@IMBalENce @CSSFrancis
Update recommended review changes
069bfbc
@hakonanes @CSSFrancis
Update examples/plotting/interactive_IPF.py
d792fdf 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@hakonanes @CSSFrancis
Update orix/io/plugins/ctf.py
1e34a01 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@hakonanes @CSSFrancis
Update orix/io/plugins/ctf.py
d8f4005 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@hakonanes @CSSFrancis
Update orix/io/plugins/ctf.py
209f74c 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@IMBalENce @CSSFrancis
Refine the ctf reader for more efficient header reading
d3651fa
@IMBalENce @CSSFrancis
Add back Plugin description section to avoid io.load error
0db22b9
@hakonanes @CSSFrancis
Update orix/io/plugins/ctf.py
e489eb5 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@hakonanes @CSSFrancis
Update examples/plotting/interactive_IPF.py
25f9753 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@IMBalENce @CSSFrancis
Add depreciation warning for loadctf()
a9cd442
@IMBalENce @CSSFrancis
Fix test_io timeout issue, and simplify ctf reader
9c283a5
@IMBalENce @CSSFrancis
Enhance the interactive IPF plot example
e476960
@IMBalENce @hakonanes @CSSFrancis
Update orix/io/plugins/ctf.py
6ba09f3 
Co-authored-by: Håkon Wiik Ånes <[email protected]>
@IMBalENce @CSSFrancis
minor fix in io.plugins.ctf
6b8053a
@CSSFrancis
Testing: Update test to pass with new unknown file type.
4671b73
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
4164f3a 
for more information, see https://pre-commit.ci
@hakonanes
Add unreleased section to changelog after 0.12.1
9420cd0 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Change version from 0.12.1 to 0.13.dev1
8043008 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Merge pull request pyxem#496 from hakonanes/main-into-develop-post-0.…
5331127 
…12.1

Main into develop post 0.12.1
@hakonanes
Merge branch 'main' into main-into-develop-after-0.12.1.post0
45fe426 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Merge pull request pyxem#497 from hakonanes/main-into-develop-after-0…
c9b65c8 
….12.1.post0

Self-merging as all commits have already been reviewed elsewhere.
@hakonanes
Merge branch 'develop' into ctf_reader
b06875a
@hakonanes
Rename interactive xmap plot, simplify and use CrystalMap.plot()
f250898 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Deprecate loadang (not just loadctf)
cba8ad1 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Prefer Formula over MaterialName for phase names from .ang files
e62b068 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Move private crystal map functions to allow calls from other files
bc70df1 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Update CTF to allow reading from ASTAR, EMsoft and MTEX files
0a8740b 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
List CTF reader in IO plugins in docs
de71123 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
8bdf4b2 
updates:
- [github.com/psf/black: 24.4.0 → 24.4.2](psf/black@24.4.0...24.4.2)
hakonanes added 21 commits May 11, 2024 14:22
@hakonanes
Use type hint classes for tuple and dict instead of types, valid for 3.8
1a39e98 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Complete testing of CTF reader
0b8f46b 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Exclude orix/tests directory from test coverage
2e2c8d9 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Remove a few more type hints using types (not supported on 3.8)
0b34bc2 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Update valid nbconvert versions to < 7.14, >= 7.16.4
b475758 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Merge pull request pyxem#502 from hakonanes/remove-pin-nbconvert
1564a00 
Update valid nbconvert versions to < 7.14, >= 7.16.4
@hakonanes
Remove type hints using types also in CTF reader file
a68d37e 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Merge pull request pyxem#451 from IMBalENce/ctf_reader
006e85d 
Add CTF file reader and interactive crystal map plot example
@hakonanes
Replace assert-or-raise with better check-or-raise
96e64fc 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
List @IMBalENce among contributors according to line additions
9645bdf 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Don't run test workflow for branches named 'pre-commit-ci-update-config'
56629c3 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Improve type hints in the Miller class
1cdc59a 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Add simple test for Vector3d.get_nearest()
0c023ec 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Replace np.float64(rotation.a) with rotation.a.astype(np.float64)
b7e873b 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Remove deprecated from_neo_euler() methods and convention parameter
e616f9a 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Fix GitHub CI: use only branches-ignore, not in addition to branches
1a4f344 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Merge pull request pyxem#504 from hakonanes/minor-dev-updates
688ee4a 
Minor dev updates
@hakonanes
Temporarily add PyCIFRW as dependency (dependency of diffpy.structure)
7ee6852 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Minor fixes in crystal map and rotation plots using Matplotlib
7736ab1 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Increment version to 0.13.0 and update CHANGELOG accordingly
54aeadf 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes
Fix links to related projects in docs
d94130b 
Signed-off-by: Håkon Wiik Ånes <[email protected]>
@hakonanes hakonanes added the dev Package maintenance label Sep 2, 2024
@hakonanes hakonanes added this to the v0.13.0 milestone Sep 2, 2024
@hakonanes hakonanes requested a review from pc494 September 2, 2024 18:50
@hakonanes hakonanes mentioned this pull request Sep 2, 2024
Closed
5 tasks
@hakonanes
Copy link
Member Author

I'd ignore the failing 3.8 tests. I suggest to deprecate 3.8 and 3.9 and look forward to 3.12.

pc494
pc494 approved these changes Sep 3, 2024
View reviewed changes
Copy link
Member

@pc494 pc494 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming I've understood correctly (that everything before the merge of #504 was reviewed before it went in to develop) this LGTM as the changes post #504 seem solid.

Merge when ready (unless orix has explicit no-self-merge in which case tag me and I will do it).

@hakonanes
Copy link
Member Author

Indeed, the only new commits are from 7ee6852. I'm fine with people merging their own PRs after approval, and hope you are too. Thanks for the review!

@hakonanes hakonanes merged commit aca9a84 into pyxem:main Sep 3, 2024
11 of 12 checks passed
@hakonanes hakonanes deleted the prepare-0.13.0-release branch September 3, 2024 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pc494 pc494 pc494 approved these changes

Assignees
No one assigned
Labels
dev Package maintenance
Projects
None yet
Milestone
v0.13.0
Development

Successfully merging this pull request may close these issues.
4 participants
@hakonanes @pc494 @IMBalENce @CSSFrancis