Draft
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge MicroPython v1.27. This merge includes v1.26 as well.
extmod/modre.cincludes support forposandendposarguments inmatch()andsearch(). This replaces our own implementation with upstream.MP_NORETURNis now used everywhere instead ofNORETURN.ports/unix/coveragecpp.cppso it is more like upstream.ports/unix/main.cis now more like upstream.MICROPY_NONSTANDARD_TYPECODESnow exists in upstream asMICROPY_PY_STRUCT_UNSAFE_TYPECODES.MICROPY_PY___FILE__is nowMICROPY_MODULE___FILE__.objlist.clist_subscr()is now more like upstream.shared/runtime/pyexec.chad a number of changes in upstream. We had diverged noticeably from it already. I spent time getting back closer to the upstream version.\$to some trailing whitespace in test.py.expfiles so the whitespace would not be trimmed away, and noted this upstream: Handle trailing whitespace in test .exp files using regexp syntax micropython/micropython#19068 and tests/**/*.py.exp: protect trailing spaces with\$micropython/micropython#19073.In general, this was a pretty easy merge. It makes me want to submit a few more PR's upstream to remove other differences.
Before submitting this PR, I did a few successful builds and did some REPL smoke tests. I will start this as a draft PR and do some more in-depth testing on boards after all the builds are successful.