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

Merge MicroPython v1.11 into CircuitPython #4649

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Merge MicroPython v1.11 into CircuitPython #4649

merged 1 commit into from
Apr 27, 2021

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Apr 23, 2021

Another step for #2999

jepler
jepler previously approved these changes Apr 23, 2021
View reviewed changes
Copy link
Member

@jepler jepler left a comment

Choose a reason for hiding this comment

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

I looked at a subset of this and didn't see anything of concern. No testing performed.

dhalbert
dhalbert reviewed Apr 23, 2021
View reviewed changes
Copy link
Collaborator

@dhalbert dhalbert left a comment •
edited

Choose a reason for hiding this comment

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

I looked through all the interesting files (I skip the tests). Looks good, and this is simpler than V1.10, so it should get easier and easier.

I'll do some more extensive filesystem testing when the build works, due to the update of oofatfs.

py/circuitpy_defns.mk
lib/utils/pyexec.c \
lib/utils/stdout_helpers.c \
lib/utils/sys_stdio_mphal.c

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yay!

@tannewt tannewt mentioned this pull request Apr 23, 2021
Merged
@tannewt tannewt marked this pull request as ready for review April 26, 2021 23:54
@tannewt tannewt requested review from dhalbert and jepler April 26, 2021 23:54
@tannewt
Copy link
Member Author

tannewt commented Apr 26, 2021

Ok, build is passing. I turned off some modules to make it fit. Mostly synthio, msgpack, and asyncio.

dhalbert
dhalbert approved these changes Apr 27, 2021
View reviewed changes
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Works for me! I used the Metro M4 version, edited code.py, and also copied and editing a much larger file, whose contents were fine over reboots.

@tannewt tannewt merged commit 17fcd49 into adafruit:main Apr 27, 2021
@dunkmann00 dunkmann00 mentioned this pull request Apr 29, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhalbert dhalbert dhalbert approved these changes

@jepler jepler Awaiting requested review from jepler

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tannewt @jepler @dhalbert