8000 Merge pull request #17 from adafruit/main · tannewt/circuitpython@a44c09e · GitHub
[go: up one dir, main page]
Skip to content

Commit a44c09e

Browse files
DavePutzDavePutz
authored
Merge pull request #17 from adafruit/main
update from main
2 parents eac639a + 2b1fc15 commit a44c09e

File tree

173 files changed

+4585
-1231
lines changed
  • __init__.c
  • terminalio
  • touchio
  • uheap
  • ulab
  • usb_hid

    • Original file line numberDiff line numberDiff line change
    @@ -37,7 +37,7 @@ jobs:
    3737
    run: |
    3838
    sudo apt-get install -y eatmydata
    3939
    sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
    40-
    pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort
    40+
    pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli
    4141
    - name: Versions
    4242
    run: |
    4343
    gcc --version
    @@ -86,24 +86,32 @@ jobs:
    8686
    working-directory: tools
    8787
    - name: Build mpy-cross.static-raspbian
    8888
    run: make -C mpy-cross -j2 -f Makefile.static-raspbian
    89-
    - uses: actions/upload-artifact@v1.0.0
    89+
    - uses: actions/upload-artifact@v2
    9090
    with:
    9191
    name: mpy-cross.static-raspbian
    9292
    path: mpy-cross/mpy-cross.static-raspbian
    93-
    9493
    - name: Build mpy-cross.static
    9594
    run: make -C mpy-cross -j2 -f Makefile.static
    96-
    - uses: actions/upload-artifact@v1.0.0
    95+
    - uses: actions/upload-artifact@v2
    9796
    with:
    9897
    name: mpy-cross.static-amd64-linux
    9998
    path: mpy-cross/mpy-cross.static
    100-
    10199
    - name: Build mpy-cross.static-mingw
    102100
    run: make -C mpy-cross -j2 -f Makefile.static-mingw
    103-
    - uses: actions/upload-artifact@v1.0.0
    101+
    - uses: actions/upload-artifact@v2
    104102
    with:
    105103
    name: mpy-cross.static-x64-windows
    106104
    path: mpy-cross/mpy-cross.static.exe
    105+
    - name: Upload mpy-cross builds to S3
    106+
    run: |
    107+
    [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
    108+
    [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
    109+
    [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
    110+
    env:
    111+
    AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
    112+
    AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
    113+
    if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
    114+
    107115

    108116
    mpy-cross-mac:
    109117
    runs-on: macos-10.15
    @@ -112,9 +120,9 @@ jobs:
    112120
    env:
    113121
    GITHUB_CONTEXT: ${{ toJson(github) }}
    114122
    run: echo "$GITHUB_CONTEXT"
    115-
    - name: Make gettext programs available
    123+
    - name: Install dependencies
    116124
    run: |
    117-
    brew install gettext
    125+
    brew install gettext awscli
    118126
    echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
    119127
    - name: Versions
    120128
    run: |
    @@ -127,13 +135,23 @@ jobs:
    127135
    fetch-depth: 0
    128136
    - run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
    129137
    - name: CircuitPython version
    130-
    run: git describe --dirty --tags
    138+
    run: |
    139+
    git describe --dirty --tags
    140+
    echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)"
    131141
    - name: Build mpy-cross
    132142
    run: make -C mpy-cross -j2
    133-
    - uses: actions/upload-artifact@v1.0.0
    143+
    - uses: actions/upload-artifact@v2
    134144
    with:
    135145
    name: mpy-cross-macos-catalina
    136146
    path: mpy-cross/mpy-cross
    147+
    - name: Upload mpy-cross build to S3
    148+
    run: |
    149+
    [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
    150+
    env:
    151+
    AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
    152+
    AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
    153+
    if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
    154+
    137155

    138156
    build-arm:
    139157
    runs-on: ubuntu-18.04
    @@ -154,6 +172,7 @@ jobs:
    154172
    - "bast_pro_mini_m0"
    155173
    - "bdmicro_vina_m0"
    156174
    - "bless_dev_board_multi_sensor"
    175+
    - "blm_badge"
    157176
    - "capablerobot_usbhub"
    158177
    - "catwan_usbstick"
    159178
    - "circuitbrains_basic_m0"
    @@ -195,6 +214,7 @@ jobs:
    195214
    - "hallowing_m0_express"
    196215
    - "hallowing_m4_express"
    197216
    - "hiibot_bluefi"
    217+
    - "ikigaisense_vita"
    198218
    - "imxrt1010_evk"
    199219
    - "imxrt1020_evk"
    200220
    - "imxrt1060_evk"
    @@ -216,6 +236,7 @@ jobs:
    216236
    - "mini_sam_m4"
    217237
    - "monster_m4sk"
    218238
    - "ndgarage_ndbit6"
    239+
    - "ndgarage_ndbit6_v2"
    219240
    - "nfc_copy_cat"
    220241
    - "nice_nano"
    221242
    - "nucleo_f746zg"
    @@ -314,7 +335,7 @@ jobs:
    314335
    working-directory: tools
    315336
    env:
    316337
    BOARDS: ${{ matrix.board }}
    317-
    - uses: actions/upload-artifact@v1.0.0
    338+
    - uses: actions/upload-artifact@v2
    318339
    with:
    319340
    name: ${{ matrix.board }}
    320341
    path: bin/${{ matrix.board }}
    @@ -362,7 +383,7 @@ jobs:
    362383
    working-directory: tools
    363384
    env:
    364385
    BOARDS: ${{ matrix.board }}
    365-
    - uses: actions/upload-artifact@v1.0.0
    386+
    - uses: actions/upload-artifact@v2
    366387
    with:
    367388
    name: ${{ matrix.board }}
    368389
    path: bin/${{ matrix.board }}
    @@ -442,7 +463,7 @@ jobs:
    442463
    IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
    443464
    IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
    444465
    BOARDS: ${{ matrix.board }}
    445-
    - uses: actions/upload-artifact@v1.0.0
    466+
    - uses: actions/upload-artifact@v2
    446467
    with:
    447468
    name: ${{ matrix.board }}
    448469
    path: bin/${{ matrix.board }}
    Original file line numberDiff line numberDiff line change
    @@ -241,6 +241,7 @@ check-translate:
    241241
    stubs:
    242242
    @mkdir -p circuitpython-stubs
    243243
    @$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
    244+
    @$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
    244245
    @$(PYTHON) tools/extract_pyi.py ports/atmel-samd/bindings $(STUBDIR)
    245246
    @$(PYTHON) setup.py -q sdist
    246247

    Original file line numberDiff line numberDiff line change
    @@ -3,3 +3,5 @@ recommonmark==0.6.0
    33
    sphinxcontrib-svg2pdfconverter==0.1.0
    44
    astroid
    55
    sphinx-autoapi
    6+
    isort
    7+
    black