Skip to content

Merge changes from MicroPython v.122 release; annotate CIRCUITPY-CHANGES #70

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

Merged
merged 7 commits into from
Feb 4, 2025
Merged

Merge changes from MicroPython v.122 release; annotate CIRCUITPY-CHANGES #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b544f2f
changes from MicroPython v1.22-release; CIRCUITPY-CHANGES annotations
dhalbert Aug 7, 2024
a94cdea
add get_running_loop(); remove ThreadSafeFlag
dhalbert Aug 16, 2024
bdb94fe
update pre-commit pylint version
dhalbert Aug 16, 2024
cf028c6
restore gather as async to fix tests; restore proper await in gather
dhalbert Aug 17, 2024
c6244bf
don't use yield; touch up documentation
dhalbert Aug 17, 2024
2ea2b06
fix comment typo
dhalbert Aug 21, 2024
f5b6921
Merge branch 'main' into v1.22-merge
dhalbert Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pycqa/pylint
rev: v2.17.4
rev: v3.2.6
hooks:
- id: pylint
name: pylint (library code)
Expand Down
10 changes: 7 additions & 3 deletions asyncio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# SPDX-FileCopyrightText: 2019 Damien P. George
# CIRCUITPY-CHANGE: SPDX
# SPDX-FileCopyrightText: 2019-2020 Damien P. George
#
# SPDX-License-Identifier: MIT
#
# MicroPython uasyncio module

# MicroPython asyncio module
# MIT license; Copyright (c) 2019 Damien P. George
#
# CIRCUITPY-CHANGE
# This code comes from MicroPython, and has not been run through black or pylint there.
# Altering these files significantly would make merging difficult, so we will not use
# pylint or black.
Expand All @@ -13,6 +15,7 @@

from .core import *

# CIRCUITPY-CHANGE: use CircuitPython version
__version__ = "0.0.0+auto.0"
__repo__ = "https://github.com/Adafruit/Adafruit_CircuitPython_asyncio.git"

Expand All @@ -29,6 +32,7 @@
"StreamWriter": "stream",
}


# Lazy loader, effectively does:
# global attr
# from .mod import attr
Expand Down
Loading