Skip to content

Commit 3ecb741

Browse files
committed
Merge branch 'master' into tls_psk
Signed-off-by: Sumeta Boonchamoi <sumeta.prg@gmail.com>
2 parents 93340fa + 55e75c4 commit 3ecb741

File tree

322 files changed

+7151
-1230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+7151
-1230
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,10 @@ body:
1111
1212
* If you have a question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
1313
* For missing or incorrect documentation, or feature requests, then please [choose a different issue type](https://github.com/micropython/micropython/issues/new/choose).
14-
- type: checkboxes
15-
id: terms
16-
attributes:
17-
label: Checks
18-
description: |
19-
Before submitting your bug report, please go over these check points:
20-
options:
21-
- label: |
22-
I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
23-
required: true
24-
- label: |
25-
I've searched for [existing issues](https://github.com/micropython/micropython/issues) matching this bug, and didn't find any.
26-
required: true
14+
15+
#### Existing issue?
16+
17+
* Please search for [existing issues](https://github.com/micropython/micropython/issues) matching this bug before reporting.
2718
- type: input
2819
id: port-board-hw
2920
attributes:
@@ -33,7 +24,7 @@ body:
3324
placeholder: |
3425
esp32 port, ESP32-Fantastic board.
3526
validations:
36-
required: true
27+
required: true
3728
- type: textarea
3829
id: version
3930
attributes:
@@ -101,6 +92,17 @@ body:
10192
description: |
10293
Is there anything else that might help to resolve this issue?
10394
value: No, I've provided everything above.
95+
- type: dropdown
96+
id: code-of-conduct
97+
attributes:
98+
label: Code of Conduct
99+
description: |
100+
Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
101+
options:
102+
- "Yes, I agree"
103+
multiple: true
104+
validations:
105+
required: true
104106
- type: markdown
105107
attributes:
106108
value: |

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,10 @@ body:
99
This form is for reporting issues with the documentation or examples provided with MicroPython.
1010
1111
If you have a general question \"How Do I ...?\", please post it on [GitHub Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead of here.
12-
- type: checkboxes
13-
id: terms
14-
attributes:
15-
label: Checks
16-
description: |
17-
Before submitting your bug report, please go over these check points:
18-
options:
19-
- label: |
20-
I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
21-
required: true
22-
- label: |
23-
I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
24-
required: true
12+
13+
#### Existing issue?
14+
15+
* Please search for [existing issues](https://github.com/micropython/micropython/issues) before reporting a new one.
2516
- type: input
2617
id: page
2718
attributes:
@@ -38,6 +29,17 @@ body:
3829
Please describe what was missing from the documentation and/or what was incorrect/incomplete.
3930
validations:
4031
required: true
32+
- type: dropdown
33+
id: code-of-conduct
34+
attributes:
35+
label: Code of Conduct
36+
description: |
37+
Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
38+
options:
39+
- "Yes, I agree"
40+
multiple: true
41+
validations:
42+
required: true
4143
- type: markdown
4244
attributes:
4345
value: |

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,10 @@ body:
1515
1616
* If you have a question \"How Do I ...?\", please post it on GitHub Discussions or Discord instead of here.
1717
* Could this feature be implemented as a pure Python library? If so, please open the request on the [micropython-lib repository](https://github.com/micropython/micropython-lib/issues) instead.
18-
- type: checkboxes
19-
id: terms
20-
attributes:
21-
label: Checks
22-
description: |
23-
Before submitting your feature request, please go over these check points:
24-
options:
25-
- label: |
26-
I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
27-
required: true
28-
- label: |
29-
I've searched for [existing issues](https://github.com/micropython/micropython/issues) regarding this feature, and didn't find any.
30-
required: true
18+
19+
#### Existing issue?
20+
21+
* Please search for [existing issues](https://github.com/micropython/micropython/issues) before opening a new one.
3122
- type: textarea
3223
id: feature
3324
attributes:
@@ -51,14 +42,32 @@ body:
5142
MicroPython aims to strike a balance between functionality and code size. Can this feature be optionally enabled?
5243
5344
If you believe the usefulness of this feature would outweigh the additional code size, please explain. (It's OK to say you're unsure here, we're happy to discuss this with you.)
54-
- type: checkboxes
45+
- type: dropdown
5546
id: implementation
5647
attributes:
5748
label: Implementation
49+
description: |
50+
What is your suggestion for implementing this feature?
51+
52+
(See also: [How to sponsor](https://github.com/sponsors/micropython#sponsors), [How to submit a Pull Request](https://github.com/micropython/micropython/wiki/ContributorGuidelines).)
5853
options:
59-
- label: I intend to implement this feature and would submit a Pull Request if desirable.
60-
- label: I hope the MicroPython maintainers or community will implement this feature.
61-
- label: I would like to [Sponsor](https://github.com/sponsors/micropython#sponsors) development of this feature.
54+
- I hope the MicroPython maintainers or community will implement this feature
55+
- I intend to implement this feature and would submit a Pull Request if desirable
56+
- I would like to sponsor development of this feature
57+
multiple: true
58+
validations:
59+
required: true
60+
- type: dropdown
61+
id: code-of-conduct
62+
attributes:
63+
label: Code of Conduct
64+
description: |
65+
Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
66+
options:
67+
- "Yes, I agree"
68+
multiple: true
69+
validations:
70+
required: true
6271
- type: markdown
6372
attributes:
6473
value: |

.github/ISSUE_TEMPLATE/security.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,11 @@ body:
99
1010
1. For issues that are readily exploitable or have high impact, please email contact@micropython.org instead.
1111
1. If this is a question about security, please ask it in [Discussions](https://github.com/orgs/micropython/discussions/) or [Discord](https://discord.gg/RB8HZSAExQ) instead.
12-
- type: checkboxes
13-
id: terms
14-
attributes:
15-
label: Checks
16-
description: |
17-
Before submitting your bug report, please go over these check points:
18-
options:
19-
- label: |
20-
I agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone.
21-
required: true
22-
- label: I wish to report a specific security issue that is **not readily exploitable and does not have high impact** for MicroPython developers or users.
23-
required: true
24-
- label: |
25-
I've searched for [existing issues](https://github.com/micropython/micropython/issues) and didn't find any that matched.
26-
required: true
12+
13+
#### Existing issue?
14+
15+
* Please search for [existing issues](https://github.com/micropython/micropython/issues) before reporting a new one.
16+
2717
- type: input
2818
id: port-board-hw
2919
attributes:
@@ -57,3 +47,14 @@ body:
5747
* How does the attacker exploit this issue?
5848
validations:
5949
required: true
50+
- type: dropdown
51+
id: code-of-conduct
52+
attributes:
53+
label: Code of Conduct
54+
description: |
55+
Do you agree to follow the MicroPython [Code of Conduct](https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md) to ensure a safe and respectful space for everyone?
56+
options:
57+
- "Yes, I agree"
58+
multiple: true
59+
validations:
60+
required: true

.github/pull_request_template.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!-- Thanks for submitting a Pull Request! We appreciate you spending the
2+
time to improve MicroPython. Please provide enough information so that
3+
others can review your Pull Request.
4+
5+
Before submitting, please read:
6+
https://github.com/micropython/micropython/blob/master/CODEOFCONDUCT.md
7+
https://github.com/micropython/micropython/wiki/ContributorGuidelines
8+
9+
Please check any CI failures that appear after your Pull Request is opened.
10+
-->
11+
12+
### Summary
13+
14+
<!-- Explain the reason for making this change. What problem does the pull request
15+
solve, or what improvement does it add? Add links if relevant. -->
16+
17+
18+
### Testing
19+
20+
<!-- Explain what testing you did, and on which boards/ports. If there are
21+
boards or ports that you couldn't test, please mention this here as well.
22+
23+
If you leave this empty then your Pull Request may be closed. -->
24+
25+
26+
### Trade-offs and Alternatives
27+
28+
<!-- If the Pull Request has some negative impact (i.e. increased code size)
29+
then please explain why you think the trade-off improvement is worth it.
30+
If you can think of alternative ways to do this, please explain that here too.
31+
32+
Delete this heading if not relevant (i.e. small fixes) -->
33+
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: qemu-riscv port
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths:
7+
- '.github/workflows/*.yml'
8+
- 'tools/**'
9+
- 'py/**'
10+
- 'extmod/**'
11+
- 'shared/**'
12+
- 'lib/**'
13+
- 'drivers/**'
14+
- 'ports/qemu-arm/main.c'
15+
- 'ports/qemu-riscv/**'
16+
- 'tests/**'
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
build_and_test:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@v4
27+
- name: Install packages
28+
run: source tools/ci.sh && ci_qemu_riscv_setup
29+
- name: Build and run test suite
30+
run: source tools/ci.sh && ci_qemu_riscv_build
31+
- name: Print failures
32+
if: failure()
33+
run: grep --before-context=100 --text "FAIL" ports/qemu-riscv/build/console.out

.github/workflows/ports_unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
run: tests/run-tests.py --print-failures
195195

196196
macos:
197-
runs-on: macos-11.0
197+
runs-on: macos-latest
198198
steps:
199199
- uses: actions/checkout@v4
200200
- uses: actions/setup-python@v5

LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2023 Damien P. George
3+
Copyright (c) 2013-2024 Damien P. George
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -73,6 +73,7 @@ used during the build process and is not part of the compiled source code.
7373
/ppp_set_auth.* (Apache-2.0)
7474
/rp2
7575
/mutex_extra.c (BSD-3-clause)
76+
/clocks_extra.c (BSD-3-clause)
7677
/stm32
7778
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
7879
/stm32_it.* (MIT + BSD-3-clause)

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Python 3.5 and some select features from later versions). The following core
1919
datatypes are provided: `str`(including basic Unicode support), `bytes`,
2020
`bytearray`, `tuple`, `list`, `dict`, `set`, `frozenset`, `array.array`,
2121
`collections.namedtuple`, classes and instances. Builtin modules include
22-
`os`, `sys`, `time`, `re`, and `struct`, etc. Select ports have support for
22+
`os`, `sys`, `time`, `re`, and `struct`, etc. Some ports have support for
2323
`_thread` module (multithreading), `socket` and `ssl` for networking, and
2424
`asyncio`. Note that only a subset of Python 3 functionality is implemented
2525
for the data types and modules.
@@ -35,8 +35,8 @@ DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB.
3535
Getting started
3636
---------------
3737

38-
See the [online documentation](https://docs.micropython.org/) for API
39-
references and information about using MicroPython and information about how
38+
See the [online documentation](https://docs.micropython.org/) for the API
39+
reference and information about using MicroPython and information about how
4040
it is implemented.
4141

4242
We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
@@ -114,7 +114,8 @@ In addition, the following ports are provided in this repository:
114114
- [nrf](ports/nrf) -- Nordic Semiconductor nRF51 and nRF52.
115115
- [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit.
116116
- [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt)
117-
- [qemu-arm](ports/qemu-arm) -- QEMU-based emulated target, for testing)
117+
- [qemu-arm](ports/qemu-arm) -- QEMU-based Arm emulated target (for testing)
118+
- [qemu-riscv](ports/qemu-riscv) -- QEMU-based RISC-V emulated target (for testing)
118119
- [renesas-ra](ports/renesas-ra) -- Renesas RA family.
119120
- [rp2](ports/rp2) -- Raspberry Pi RP2040 (including Pico and Pico W).
120121
- [samd](ports/samd) -- Microchip (formerly Atmel) SAMD21 and SAMD51.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
# General information about the project.
7070
project = "MicroPython"
71-
copyright = "- The MicroPython Documentation is Copyright © 2014-2023, Damien P. George, Paul Sokolovsky, and contributors"
71+
copyright = "- The MicroPython Documentation is Copyright © 2014-2024, Damien P. George, Paul Sokolovsky, and contributors"
7272

7373
# The version info for the project you're documenting, acts as replacement for
7474
# |version| and |release|, also used in various other places throughout the

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy