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 1.12 into CircuitPython #4693

Merged
merged 1 commit into from
May 3, 2021
Merged

Merge MicroPython 1.12 into CircuitPython #4693

merged 1 commit into from
May 3, 2021

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Apr 30, 2021

For issue #2999

@tannewt tannewt requested a review from jepler April 30, 2021 21:31
jepler
jepler previously approved these changes Apr 30, 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.

Thanks! I don't know that file-by-file review is going to be useful here, so I didn't.

@dhalbert
Copy link
Collaborator

I am looking at the files...

dhalbert
dhalbert requested changes Apr 30, 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.

Thanks again! I looked over everything briefly. Mostly just worried about new uarray, and new functionality in CPython-named modules, but I see it's off by default.

docs/library/array.rst Outdated Show resolved Hide resolved
docs/library/sys.rst Outdated Show resolved Hide resolved
docs/library/sys.rst Outdated Show resolved Hide resolved
docs/library/sys.rst Show resolved Hide resolved
py/modarray.c Outdated Show resolved Hide resolved
py/modmath.c Show resolved Hide resolved
py/mpconfig.h Show resolved Hide resolved
py/objmodule.c Show resolved Hide resolved
py/objtuple.c Show resolved Hide resolved
py/ringbuf.c Show resolved Hide resolved
This was referenced May 2, 2021
Closed
Closed
@tannewt tannewt requested a review from dhalbert May 3, 2021 20:03
dhalbert
dhalbert requested changes May 3, 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.

Just the uarray -> array thing. Otherwise looks good!

docs/library/array.rst Outdated Show resolved Hide resolved
dhalbert
dhalbert approved these changes May 3, 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.

👍

@tannewt tannewt merged commit f5f18b2 into adafruit:main May 3, 2021
@jepler jepler mentioned this pull request May 5, 2021
Merged
@anecdata anecdata mentioned this pull request May 11, 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 jepler left review comments

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 @dhalbert @jepler