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

Merge latest changes to branch 'main' into branch 'development' #25

Merged
merged 5 commits into from
Aug 23, 2024

Conversation

jlw387
Copy link
Collaborator

@jlw387 jlw387 commented Aug 22, 2024

This pull request is for merging the latest changes to the main branch into the development branch. These changes include:

  • Adding support for multiple solutes in the function create_solution()
  • Improved error handling for convert_one() and create_solution() functions
  • Additional testing for create_solution()
  • NumPy version clamping to 1.23.5
  • Updated release number (0.4.5 -> 0.4.7)

@jlw387 jlw387 self-assigned this Aug 22, 2024
@jlw387
Copy link
Collaborator Author

jlw387 commented Aug 23, 2024

Stricter branch protections will be implemented in the near future which will include a requirement that branches be up-to-date when merging with main or development. Thus, it is important that development be up-to-date with main to avoid issues with future merges.

@jlw387 jlw387 merged commit 4d15393 into development Aug 23, 2024
1 check passed
@jlw387 jlw387 changed the title Merge latest changes to branch 'main' into development Merge latest changes to branch 'main' into branch 'development' Aug 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants