[conflict] Merge main (v0.6.1) into pre-0.7 to resolve the conflict #253
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d-Algorithms-group#227) Numojo 0.6.1 This pull request includes several changes to the `mojoproject.toml` file and the `numojo` package, focusing on improving the build process, testing, and formatting functionalities. Additionally, there are updates to the handling of print options in the `numojo` package. ### Improvements to build and testing process: * [`mojoproject.toml`](diffhunk://#diff-1b0ef62120bccf4c05a76e60e13fe686f33eb92d5897b3f05e0c3f8d737fc5c0L19-R27): Updated the `package` task to include copying the package to the tests folder and modified the `test` task to test the built package. * [`mojoproject.toml`](diffhunk://#diff-1b0ef62120bccf4c05a76e60e13fe686f33eb92d5897b3f05e0c3f8d737fc5c0L43-R44): Simplified the `final` task to run format and test commands, and updated the `f` alias to run the `final` task. ### Dependency updates: * [`mojoproject.toml`](diffhunk://#diff-1b0ef62120bccf4c05a76e60e13fe686f33eb92d5897b3f05e0c3f8d737fc5c0L53-R53): Updated the `max` dependency version to `25.1.1`. ### Codebase simplification: * `numojo/__init__.mojo`, `numojo/core/complex/complex_ndarray.mojo`, `numojo/routines/io/__init__.mojo`: Removed the unused `printoptions` import. [[1]](diffhunk://#diff-c866aa2a9b7b267a54550b85f8f3bd958d31806072b3f8449cfeb3e1b04fb954L65-R65) [[2]](diffhunk://#diff-50999070ae6817e2537de378c19bc32ee0ee691681f0c39492d8e9fc0d540a35L37) [[3]](diffhunk://#diff-44cb945c42164cf66f26636ae61d288b6b52ed68e756a3e09b81725c27a97b96L9-L10) * [`numojo/routines/io/formatting.mojo`](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL23-R23): Replaced `GLOBAL_PRINT_OPTIONS` with a local `default_print_options` instance in several functions and methods, and added new parameters to the `format_floating_scientific` and `format_floating_precision` functions for better control over formatting behavior. [[1]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL23-R23) [[2]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL149-R132) [[3]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL166-R153) [[4]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL195-R180) [[5]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL207-R199) [[6]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aR213-R217) [[7]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL238-L241) [[8]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL293-R291) [[9]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aR300) [[10]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL319) [[11]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL352-R362) [[12]](diffhunk://#diff-ebe0524c71023004d26ae3e618bbaabd5177b5261be63254bf3d483f16af991aL366-L368) --------- Co-authored-by: MadAlex1997 <[email protected]>
shivasankarka
approved these changes
Jun 10, 2025
forfudan
merged commit d933007
into
Mojo-Numerics-and-Algorithms-group:pre-0.7
2 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are conflicts between v0.6.1 (main) and the pre-0.7 branches. We have to resolve them by first merging main to pre-0.7. This cannot be done via a squash.
@shivasankarka, @MadAlex1997, please just approve it and not merge. I will take of the merging.