Add mbedtls support

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: micropython

.github/workflows/docs.yml

@@ -0,0 +1,18 @@
+name: Build docs
+
+on:
+  pull_request:
+    paths:
+      - docs/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Install Python packages
+      run: pip install Sphinx
+    - name: Build docs
+      run: make -C docs/ html

.gitignore

@@ -27,8 +27,7 @@ build-*/
 
 # Test failure outputs
 ######################
-tests/*.exp
-tests/*.out
+tests/results/*
 
 # Python cache files
 ######################

.travis.yml

@@ -25,24 +25,52 @@ jobs:
     - stage: test
       os: linux
       dist: bionic
-      env: NAME="code formatting"
+      name: "code formatting"
       before_install:
         - sudo apt-add-repository --yes --update ppa:pybricks/ppa
       install:
         - sudo apt-get install uncrustify python3-pip
         - uncrustify --version
+        - pip3 install --user setuptools
         - pip3 install --user black
         - black --version
       script:
         - tools/codeformat.py
         - git diff --exit-code
 
+    # zephyr port
+    - stage: test
+      name: "zephyr port build"
+      services:
+        - docker
+      before_install:
+        - docker pull zephyrprojectrtos/ci:v0.11.8
+        - >
+          docker run --name zephyr-ci -d -it
+          -v "$(pwd)":/micropython
+          -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3
+          -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          -w /micropython/ports/zephyr
+          zephyrprojectrtos/ci:v0.11.8
+        - docker ps -a
+      install:
+        - docker exec zephyr-ci west init --mr v2.4.0 /zephyrproject
+        - docker exec -w /zephyrproject zephyr-ci west update
+        - docker exec -w /zephyrproject zephyr-ci west zephyr-export
+      script:
+        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS}"
+        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS} BOARD=frdm_k64f"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS}"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=frdm_k64f"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=mimxrt1050_evk"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=reel_board"
+
     # unix port on OSX (first in list because the build VM takes a long time to start)
     - stage: test
       os: osx
       osx_image: xcode11.3
+      name: "unix port build with clang on OSX"
       env:
-        - NAME="unix port build with clang on OSX"
         - PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
       script:
         - make ${MAKEOPTS} -C mpy-cross
@@ -59,13 +87,12 @@ jobs:
 
     # stm32 port
     - stage: test
-      env: NAME="stm32 port build"
+      name: "stm32 port build"
       install:
         # need newer gcc version for Cortex-M7 support
         - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
         - sudo apt-get update -qq || true
-        - sudo apt-get install gcc-arm-embedded
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-embedded libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:
         - make ${MAKEOPTS} -C mpy-cross
@@ -79,27 +106,29 @@ jobs:
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
         - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
+        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
         - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
+        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
 
     # qemu-arm port
     - stage: test
       dist: bionic # needed for more recent version of qemu-system-arm with mps2-an385 target
-      env: NAME="qemu-arm port build and tests"
+      name: "qemu-arm port build and tests"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
-        - sudo apt-get install qemu-system
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system
         - arm-none-eabi-gcc --version
         - qemu-system-arm --version
       script:
         - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
+        - make ${MAKEOPTS} -C ports/qemu-arm clean
         - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
       after_failure:
         - grep --text "FAIL" ports/qemu-arm/build/console.out
 
     # unix coverage
     - stage: test
-      env: NAME="unix coverage build and tests"
+      name: "unix coverage build and tests"
       install:
         - sudo apt-get install python3-pip
         - sudo pip install cpp-coveralls
@@ -134,7 +163,7 @@ jobs:
 
     # unix coverage 32-bit
     - stage: test
-      env: NAME="unix coverage 32-bit build and tests"
+      name: "unix coverage 32-bit build and tests"
       install:
         - sudo apt-get install gcc-multilib libffi-dev:i386
         - sudo apt-get install python3-pip
@@ -166,7 +195,7 @@ jobs:
 
     # standard unix port
     - stage: test
-      env: NAME="unix port build and tests"
+      name: "unix port build and tests"
       script:
         - make ${MAKEOPTS} -C mpy-cross
         - make ${MAKEOPTS} -C ports/unix submodules
@@ -179,7 +208,7 @@ jobs:
 
     # unix nanbox/float (and using Python 2 to check it can run the build scripts)
     - stage: test
-      env: NAME="unix nanbox/float port build and tests"
+      name: "unix nanbox/float port build and tests"
       install:
         - sudo apt-get install gcc-multilib libffi-dev:i386
       script:
@@ -196,7 +225,7 @@ jobs:
 
     # unix stackless/float with clang
     - stage: test
-      env: NAME="unix stackless/float port build and tests with clang"
+      name: "unix stackless/float port build and tests with clang"
       install:
         - sudo apt-get install clang
       script:
@@ -212,7 +241,7 @@ jobs:
 
     # unix with sys.settrace
     - stage: test
-      env: NAME="unix port with sys.settrace build and tests"
+      name: "unix port with sys.settrace build and tests"
       script:
         - make ${MAKEOPTS} -C mpy-cross
         - make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" test || travis_terminate 1
@@ -223,7 +252,7 @@ jobs:
 
     # minimal unix port with tests
     - stage: test
-      env: NAME="minimal unix port build and tests"
+      name: "minimal unix port build and tests"
       script:
         - make ${MAKEOPTS} -C ports/unix VARIANT=minimal
         - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
@@ -232,7 +261,7 @@ jobs:
 
     # windows port via mingw
     - stage: test
-      env: NAME="windows port build via mingw"
+      name: "windows port build via mingw"
       install:
         - sudo apt-get install gcc-mingw-w64
       script:
@@ -241,7 +270,7 @@ jobs:
 
     # esp32 w/ESP-IDFv3 port
     - stage: test
-      env: NAME="esp32 ESP-IDFv3 port build"
+      name: "esp32 ESP-IDFv3 port build"
       install:
         - sudo apt-get install python3-pip
         - sudo pip3 install 'pyparsing<2.4'
@@ -258,7 +287,7 @@ jobs:
 
     # esp32 w/ESP-IDFv4 port
     - stage: test
-      env: NAME="esp32 ESP-IDFv4 port build"
+      name: "esp32 ESP-IDFv4 port build"
       install:
         - sudo apt-get install python3-pip
         - sudo pip3 install 'pyparsing<2.4'
@@ -275,7 +304,7 @@ jobs:
 
     # esp8266 port
     - stage: test
-      env: NAME="esp8266 port build"
+      name: "esp8266 port build"
       install:
         - wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         - zcat xtensa-lx106-elf-standalone.tar.gz | tar x
@@ -289,24 +318,27 @@ jobs:
 
     # nrf port
     - stage: test
-      env: NAME="nrf port build"
+      name: "nrf port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
+        # need newer gcc version for Cortex-M33 support
+        - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
+        - sudo apt-get update -qq || true
+        - sudo apt-get install gcc-arm-embedded
         - sudo apt-get install libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:
+        - ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
         - make ${MAKEOPTS} -C ports/nrf submodules
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
         - make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056
+        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
+        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
 
     # bare-arm and minimal ports, with size-diff check
     - stage: test
-      env: NAME="bare-arm and minimal ports build and size-diff check"
+      name: "bare-arm and minimal ports build and size-diff check"
       install:
-        - sudo apt-get install gcc-multilib libffi-dev:i386
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-multilib libffi-dev:i386 gcc-arm-none-eabi libnewlib-arm-none-eabi
         - gcc --version
         - arm-none-eabi-gcc --version
       script:
@@ -330,38 +362,35 @@ jobs:
 
     # cc3200 port
     - stage: test
-      env: NAME="cc3200 port build"
+      name: "cc3200 port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
         - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
 
     # samd port
     - stage: test
-      env: NAME="samd port build"
+      name: "samd port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/samd submodules
         - make ${MAKEOPTS} -C ports/samd
 
     # teensy port
     - stage: test
-      env: NAME="teensy port build"
+      name: "teensy port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/teensy
 
     # powerpc port
     - stage: test
-      env: NAME="powerpc port build"
+      name: "powerpc port build"
       install:
-        - sudo apt-get install gcc-powerpc64le-linux-gnu
-        - sudo apt-get install libc6-dev-ppc64el-cross
+        - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
       script:
-        - make ${MAKEOPTS} -C ports/powerpc CROSS_COMPILE=powerpc64le-linux-gnu-
+        - make ${MAKEOPTS} -C ports/powerpc UART=potato
+        - make ${MAKEOPTS} -C ports/powerpc UART=lpc_serial

CODECONVENTIONS.md

@@ -27,9 +27,12 @@ change beyond 5 lines would likely require such detailed description.
 To get good practical examples of good commits and their messages, browse
 the `git log` of the project.
 
-MicroPython doesn't require explicit sign-off for patches ("Signed-off-by"
-lines and similar). Instead, the commit message, and your name and email
-address on it construes your sign-off of the following:
+When committing you are encouraged to sign-off your commit by adding
+"Signed-off-by" lines and similar, eg using "git commit -s".  If you don't
+explicitly sign-off in this way then the commit message, which includes your
+name and email address in the "Author" line, implies your sign-off.  In either
+case, of explicit or implicit sign-off, you are certifying and signing off
+against the following:
 
 * That you wrote the change yourself, or took it from a project with
   a compatible license (in the latter case the commit message, and possibly
@@ -43,8 +46,11 @@ address on it construes your sign-off of the following:
   copyright for your changes (for smaller changes, the commit message
   conveys your copyright; if you make significant changes to a particular
   source module, you're welcome to add your name to the file header).
-* Your signature for all of the above, which is the 'Author' line in
-  the commit message, and which should include your full real name and
+* Your contribution including commit message will be publicly and
+  indefinitely available for anyone to access, including redistribution
+  under the terms of the project's license.
+* Your signature for all of the above, which is the "Signed-off-by" line
+  or the "Author" line in the commit message, includes your full real name and
   a valid and active email address by which you can be contacted in the
   foreseeable future.
 

CONTRIBUTING.md

@@ -3,6 +3,6 @@ make sure that you are acquainted with Contributor Guidelines:
 
 https://github.com/micropython/micropython/wiki/ContributorGuidelines
 
-and Code Conventions:
+as well as the Code Conventions, which includes details of how to commit:
 
 https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2019 Damien P. George
+Copyright (c) 2013-2020 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 PYTHON        = python3
-SPHINXOPTS    =
+SPHINXOPTS    = -W --keep-going
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build/$(MICROPY_PORT)

docs/conf.py

@@ -66,15 +66,15 @@
 
 # General information about the project.
 project = 'MicroPython'
-copyright = '2014-2019, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '2014-2020, Damien P. George, Paul Sokolovsky, and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.12'
+version = release = '1.13'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.