Skip to content

Commit e315746

Browse files
maxpromermaxpromer
authored
Merge pull request #13 from microBlock-IDE/dev-update
Dev update
2 parents 941c6d8 + 0aba132 commit e315746

File tree

1,199 files changed

+45564
-6319
lines changed

Some content is hidden

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

1,199 files changed

+45564
-6319
lines changed

‎.github/workflows/ports.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Build ports metadata
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths:
7+
- '.github/workflows/*.yml'
8+
- 'tools/**'
9+
- ports/**
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Build ports download metadata
18+
run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards

‎.github/workflows/ports_esp32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Build
2323
run: source tools/ci.sh && ci_esp32_build
2424

25-
build_idf43:
25+
build_idf44:
2626
runs-on: ubuntu-20.04
2727
steps:
2828
- uses: actions/checkout@v2
2929
- name: Install packages
30-
run: source tools/ci.sh && ci_esp32_idf43_setup
30+
run: source tools/ci.sh && ci_esp32_idf44_setup
3131
- name: Build
3232
run: source tools/ci.sh && ci_esp32_build

‎.github/workflows/ports_javascript.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: javascript port
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths:
7+
- '.github/workflows/*.yml'
8+
- 'tools/**'
9+
- 'py/**'
10+
- 'extmod/**'
11+
- 'lib/**'
12+
- 'ports/javascript/**'
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Install packages
20+
run: source tools/ci.sh && ci_javascript_setup
21+
- name: Build
22+
run: source tools/ci.sh && ci_javascript_build
23+
- name: Run tests
24+
run: source tools/ci.sh && ci_javascript_run_tests

‎.github/workflows/ports_mimxrt.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: mimxrt port
2+
3+
on:
4+
push:
5+
pull_request:
6+
paths:
7+
- '.github/workflows/*.yml'
8+
- 'tools/**'
9+
- 'py/**'
10+
- 'extmod/**'
11+
- 'lib/**'
12+
- 'drivers/**'
13+
- 'ports/mimxrt/**'
14+
15+
jobs:
16+
build:
17+
runs-on: ubuntu-20.04
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Install packages
21+
run: source tools/ci.sh && ci_mimxrt_setup
22+
- name: Build
23+
run: source tools/ci.sh && ci_mimxrt_build

‎.github/workflows/ports_unix.yml‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ jobs:
5151
if: failure()
5252
run: tests/run-tests.py --print-failures
5353

54+
dev:
55+
runs-on: ubuntu-latest
56+
steps:
57+
- uses: actions/checkout@v2
58+
- name: Build
59+
run: source tools/ci.sh && ci_unix_dev_build
60+
- name: Run main test suite
61+
run: source tools/ci.sh && ci_unix_dev_run_tests
62+
- name: Print failures
63+
if: failure()
64+
run: tests/run-tests.py --print-failures
65+
5466
coverage:
5567
runs-on: ubuntu-latest
5668
steps:
@@ -65,15 +77,15 @@ jobs:
6577
run: source tools/ci.sh && ci_native_mpy_modules_build
6678
- name: Test importing .mpy generated by mpy_ld.py
6779
run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
68-
- name: Run lcov coverage analysis
80+
- name: Run gcov coverage analysis
6981
run: |
70-
mkdir -p coverage
71-
lcov --rc lcov_branch_coverage=1 --directory ports/unix/build-coverage --capture --output-file coverage/lcov.info.all
72-
lcov --remove coverage/lcov.info.all '*/lib/*' '*/ports/unix/*' '*/utils/*' --output-file coverage/lcov.info
73-
- name: Send to coveralls
74-
uses: coverallsapp/github-action@master
82+
(cd ports/unix && gcov -o build-coverage/py ../../py/*.c || true)
83+
(cd ports/unix && gcov -o build-coverage/extmod ../../extmod/*.c || true)
84+
- name: Upload coverage to Codecov
85+
uses: codecov/codecov-action@v1
7586
with:
76-
github-token: ${{ secrets.GITHUB_TOKEN }}
87+
fail_ci_if_error: true
88+
verbose: true
7789
- name: Print failures
7890
if: failure()
7991
run: tests/run-tests.py --print-failures
@@ -178,11 +190,41 @@ jobs:
178190
runs-on: macos-11.0
179191
steps:
180192
- uses: actions/checkout@v2
181-
- uses: actions/setup-python@v1
193+
- uses: actions/setup-python@v2
194+
with:
195+
python-version: '3.8'
182196
- name: Build
183197
run: source tools/ci.sh && ci_unix_macos_build
184198
- name: Run tests
185199
run: source tools/ci.sh && ci_unix_macos_run_tests
186200
- name: Print failures
187201
if: failure()
188202
run: tests/run-tests.py --print-failures
203+
204+
qemu_mips:
205+
runs-on: ubuntu-latest
206+
steps:
207+
- uses: actions/checkout@v2
208+
- name: Install packages
209+
run: source tools/ci.sh && ci_unix_qemu_mips_setup
210+
- name: Build
211+
run: source tools/ci.sh && ci_unix_qemu_mips_build
212+
- name: Run main test suite
213+
run: source tools/ci.sh && ci_unix_qemu_mips_run_tests
214+
- name: Print failures
215+
if: failure()
216+
run: tests/run-tests.py --print-failures
217+
218+
qemu_arm:
219+
runs-on: ubuntu-latest
220+
steps:
221+
- uses: actions/checkout@v2
222+
- name: Install packages
223+
run: source tools/ci.sh && ci_unix_qemu_arm_setup
224+
- name: Build
225+
run: source tools/ci.sh && ci_unix_qemu_arm_build
226+
- name: Run main test suite
227+
run: source tools/ci.sh && ci_unix_qemu_arm_run_tests
228+
- name: Print failures
229+
if: failure()
230+
run: tests/run-tests.py --print-failures

‎.gitmodules‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[submodule "lib/axtls"]
22
path = lib/axtls
3-
url = https://github.com/pfalcon/axtls
4-
branch = micropython
3+
url = https://github.com/micropython/axtls.git
54
[submodule "lib/libffi"]
65
path = lib/libffi
76
url = https://github.com/atgreen/libffi
@@ -18,18 +17,12 @@
1817
[submodule "lib/nrfx"]
1918
path = lib/nrfx
2019
url = https://github.com/NordicSemiconductor/nrfx.git
21-
[submodule "lib/mbedtls"]
22-
path = lib/mbedtls
23-
url = https://github.com/ARMmbed/mbedtls.git
2420
[submodule "lib/asf4"]
2521
path = lib/asf4
2622
url = https://github.com/adafruit/asf4
27-
[submodule "lib/tinyusb"]
28-
path = lib/tinyusb
29-
url = https://github.com/hathach/tinyusb
3023
[submodule "lib/mynewt-nimble"]
3124
path = lib/mynewt-nimble
32-
url = https://github.com/apache/mynewt-nimble.git
25+
url = https://github.com/micropython/mynewt-nimble.git
3326
[submodule "lib/btstack"]
3427
path = lib/btstack
3528
url = https://github.com/bluekitchen/btstack.git

‎LICENSE‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,67 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
22+
23+
--------------------------------------------------------------------------------
24+
25+
Unless specified otherwise (see below), the above license and copyright applies
26+
to all files in this repository.
27+
28+
Individual files may include additional copyright holders.
29+
30+
The various ports of MicroPython may include third-party software that is
31+
licensed under different terms. These licenses are summarised in the tree
32+
below, please refer to these files and directories for further license and
33+
copyright information. Note that (L)GPL-licensed code listed below is only
34+
used during the build process and is not part of the compiled source code.
35+
36+
/ (MIT)
37+
/drivers
38+
/cc3000 (BSD-3-clause)
39+
/cc3100 (BSD-3-clause)
40+
/wiznet5k (BSD-3-clause)
41+
/lib
42+
/asf4 (Apache-2.0)
43+
/axtls (BSD-3-clause)
44+
/config
45+
/scripts
46+
/config (GPL-2.0-or-later)
47+
/Rules.mak (GPL-2.0)
48+
/berkeley-db-1xx (BSD-4-clause)
49+
/btstack (See btstack/LICENSE)
50+
/cmsis (BSD-3-clause)
51+
/crypto-algorithms (NONE)
52+
/libhydrogen (ISC)
53+
/littlefs (BSD-3-clause)
54+
/lwip (BSD-3-clause)
55+
/mynewt-nimble (Apache-2.0)
56+
/nrfx (BSD-3-clause)
57+
/nxp_driver (BSD-3-Clause)
58+
/oofatfs (BSD-1-clause)
59+
/pico-sdk (BSD-3-clause)
60+
/re15 (BSD-3-clause)
61+
/stm32lib (BSD-3-clause)
62+
/tinytest (BSD-3-clause)
63+
/tinyusb (MIT)
64+
/uzlib (Zlib)
65+
/logo (uses OFL-1.1)
66+
/ports
67+
/cc3200
68+
/hal (BSD-3-clause)
69+
/simplelink (BSD-3-clause)
70+
/FreeRTOS (GPL-2.0 with FreeRTOS exception)
71+
/stm32
72+
/usbd*.c (MCD-ST Liberty SW License Agreement V2)
73+
/stm32_it.* (MIT + BSD-3-clause)
74+
/system_stm32*.c (MIT + BSD-3-clause)
75+
/boards
76+
/startup_stm32*.s (BSD-3-clause)
77+
/*/stm32*.h (BSD-3-clause)
78+
/usbdev (MCD-ST Liberty SW License Agreement V2)
79+
/usbhost (MCD-ST Liberty SW License Agreement V2)
80+
/teensy
81+
/core (PJRC.COM)
82+
/zephyr
83+
/src (Apache-2.0)
84+
/tools
85+
/dfu.py (LGPL-3.0-only)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Coverage badge](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
1+
[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
22

33
The MicroPython project
44
=======================

‎docs/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@
6666

6767
# General information about the project.
6868
project = 'MicroPython'
69-
copyright = '2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
69+
copyright = '- The MicroPython Documentation is Copyright © 2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
7070

7171
# The version info for the project you're documenting, acts as replacement for
7272
# |version| and |release|, also used in various other places throughout the
7373
# built documents.
7474
#
7575
# We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
7676
# breakdown, so use the same version identifier for both to avoid confusion.
77-
version = release = '1.15'
77+
version = release = '1.17'
7878

7979
# The language for content autogenerated by Sphinx. Refer to documentation
8080
# for a list of supported languages.

‎docs/develop/library.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ An example is the ``gc`` module discussed in :ref:`memorymanagement`.
3434
>>> gc.enable()
3535
>>>
3636
37-
MicroPython has several other builtin standard/core modules like ``io``, ``uarray`` etc.
37+
MicroPython has several other builtin standard/core modules like ``io``, ``array`` etc.
3838
Adding a new core module involves several modifications.
3939

4040
First, create the ``C`` file in the ``py/`` directory. In this example we are adding a

0 commit comments

Comments
 (0)