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

Main into develop after release 0.8.5 #640

Merged
merged 7 commits into from May 21, 2023
Merged

Main into develop after release 0.8.5 #640

merged 7 commits into from May 21, 2023

Conversation

hakonanes
Copy link
Member

Description of the change

Standard merge of changes on main into develop after 0.8.5 patch release.

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.
  • New contributors are added to release.py, .zenodo.json and
    .all-contributorsrc with the table regenerated.

@hakonanes
Fix merging of maps with non-indexed points
c2732fb 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes
Test merging of maps with non-indexed points
2ec50c5 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes
Filter runtime warnings from NumPy related to dtype casting in tests
866c334 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes
Add changelog section for patch release 0.8.5
5507320 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes
Bump release version from 0.8.4 to 0.8.5
9692eaa 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes
Merge pull request pyxem#639 from hakonanes/fix-637
d5e1236 
Fix merging of maps with non-indexed points and release v0.8.5
@hakonanes
Merge branch 'develop' into main-into-develop-post-0.8.5
657e4ac 
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes hakonanes added the maintenance This relates to package maintenance label May 21, 2023
@hakonanes hakonanes merged commit 37400b5 into pyxem:develop May 21, 2023
12 checks passed
@hakonanes hakonanes deleted the main-into-develop-post-0.8.5 branch May 21, 2023 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
maintenance This relates to package maintenance
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@hakonanes