Skip to content

Commit fea9af5

Browse files
jeplerjepler
committed
Merge commit 'refs/pull/6031/head' of https://github.com/adafruit/circuitpython into fix-compression
2 parents a58bf23 + 1ac92fb commit fea9af5

Some content is hidden

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

45 files changed

+483
-130
lines changed

‎.github/workflows/build.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
run: python tools/ci_fetch_deps.py test ${{ github.sha }}
4343
- name: CircuitPython version
4444
run: |
45-
git describe --dirty --tags || git log --parents HEAD~4..
46-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
45+
tools/describe || git log --parents HEAD~4..
46+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
4747
- name: Install dependencies
4848
run: |
4949
sudo apt-get update
@@ -148,8 +148,8 @@ jobs:
148148
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
149149
- name: CircuitPython version
150150
run: |
151-
git describe --dirty --tags
152-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
151+
tools/describe || git log --parents HEAD~4..
152+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
153153
- name: Install dependencies
154154
run: |
155155
brew install gettext
@@ -204,8 +204,8 @@ jobs:
204204
run: python tools/ci_fetch_deps.py docs ${{ github.sha }}
205205
- name: CircuitPython version
206206
run: |
207-
git describe --dirty --tags
208-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
207+
tools/describe || git log --parents HEAD~4..
208+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
209209
- name: Set up Python 3
210210
uses: actions/setup-python@v2
211211
with:
@@ -379,7 +379,9 @@ jobs:
379379
- name: Get CP deps
380380
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
381381
- name: CircuitPython version
382-
run: git describe --dirty --tags
382+
run: |
383+
tools/describe || git log --parents HEAD~4..
384+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
383385
- uses: actions/cache@v2
384386
name: Fetch IDF tool cache
385387
id: idf-cache

‎.github/workflows/create_website_pr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ jobs:
3434
gcc --version
3535
python3 --version
3636
- name: CircuitPython version
37-
run: git describe --dirty --tags
37+
run: |
38+
tools/describe || git log --parents HEAD~4..
39+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
3840
- name: Website
3941
run: python3 build_board_info.py
4042
working-directory: tools

‎.github/workflows/ports_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777
run: python tools/ci_fetch_deps.py windows ${{ github.sha }}
7878
- name: CircuitPython version
7979
run: |
80-
git describe --dirty --tags
81-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
80+
tools/describe || git log --parents HEAD~4..
81+
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
8282
8383
- name: build mpy-cross
8484
run: make -j2 -C mpy-cross

‎conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@
2424
import sys
2525
import urllib.parse
2626
import time
27+
import pathlib
2728
from collections import defaultdict
2829

2930
from sphinx.transforms import SphinxTransform
3031
from docutils import nodes
3132
from sphinx import addnodes
3233

34+
tools_describe = str(pathlib.Path(__file__).parent / "tools/describe")
35+
3336
# If extensions (or modules to document with autodoc) are in another directory,
3437
# add these directories to sys.path here. If the directory is relative to the
3538
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -129,7 +132,7 @@ def autoapi_prepare_jinja_env(jinja_env):
129132

130133
final_version = ""
131134
git_describe = subprocess.run(
132-
["git", "describe", "--dirty", "--tags"],
135+
[tools_describe],
133136
stdout=subprocess.PIPE,
134137
stderr=subprocess.STDOUT,
135138
encoding="utf-8"

‎locale/ID.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,6 +3667,10 @@ msgstr ""
36673667
msgid "matrix is not positive definite"
36683668
msgstr ""
36693669

3670+
#: shared-bindings/wifi/Radio.c
3671+
msgid "max_connections must be between 0 and 10"
3672+
msgstr ""
3673+
36703674
#: ports/espressif/common-hal/_bleio/Descriptor.c
36713675
#: ports/nrf/common-hal/_bleio/Characteristic.c
36723676
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/circuitpython.pot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3630,6 +3630,10 @@ msgstr ""
36303630
msgid "matrix is not positive definite"
36313631
msgstr ""
36323632

3633+
#: shared-bindings/wifi/Radio.c
3634+
msgid "max_connections must be between 0 and 10"
3635+
msgstr ""
3636+
36333637
#: ports/espressif/common-hal/_bleio/Descriptor.c
36343638
#: ports/nrf/common-hal/_bleio/Characteristic.c
36353639
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/cs.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,6 +3641,10 @@ msgstr ""
36413641
msgid "matrix is not positive definite"
36423642
msgstr ""
36433643

3644+
#: shared-bindings/wifi/Radio.c
3645+
msgid "max_connections must be between 0 and 10"
3646+
msgstr ""
3647+
36443648
#: ports/espressif/common-hal/_bleio/Descriptor.c
36453649
#: ports/nrf/common-hal/_bleio/Characteristic.c
36463650
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/de_DE.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3692,6 +3692,10 @@ msgstr "Mathe-Domain-Fehler"
36923692
msgid "matrix is not positive definite"
36933693
msgstr "Matrix ist nicht positiv definitiv"
36943694

3695+
#: shared-bindings/wifi/Radio.c
3696+
msgid "max_connections must be between 0 and 10"
3697+
msgstr ""
3698+
36953699
#: ports/espressif/common-hal/_bleio/Descriptor.c
36963700
#: ports/nrf/common-hal/_bleio/Characteristic.c
36973701
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/el.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3630,6 +3630,10 @@ msgstr ""
36303630
msgid "matrix is not positive definite"
36313631
msgstr ""
36323632

3633+
#: shared-bindings/wifi/Radio.c
3634+
msgid "max_connections must be between 0 and 10"
3635+
msgstr ""
3636+
36333637
#: ports/espressif/common-hal/_bleio/Descriptor.c
36343638
#: ports/nrf/common-hal/_bleio/Characteristic.c
36353639
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/en_GB.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,6 +3667,10 @@ msgstr "math domain error"
36673667
msgid "matrix is not positive definite"
36683668
msgstr "matrix is not positive definite"
36693669

3670+
#: shared-bindings/wifi/Radio.c
3671+
msgid "max_connections must be between 0 and 10"
3672+
msgstr ""
3673+
36703674
#: ports/espressif/common-hal/_bleio/Descriptor.c
36713675
#: ports/nrf/common-hal/_bleio/Characteristic.c
36723676
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/es.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3709,6 +3709,10 @@ msgstr "error de dominio matemático"
37093709
msgid "matrix is not positive definite"
37103710
msgstr "matrix no es definida positiva"
37113711

3712+
#: shared-bindings/wifi/Radio.c
3713+
msgid "max_connections must be between 0 and 10"
3714+
msgstr ""
3715+
37123716
#: ports/espressif/common-hal/_bleio/Descriptor.c
37133717
#: ports/nrf/common-hal/_bleio/Characteristic.c
37143718
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/fil.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,6 +3669,10 @@ msgstr "may pagkakamali sa math domain"
36693669
msgid "matrix is not positive definite"
36703670
msgstr ""
36713671

3672+
#: shared-bindings/wifi/Radio.c
3673+
msgid "max_connections must be between 0 and 10"
3674+
msgstr ""
3675+
36723676
#: ports/espressif/common-hal/_bleio/Descriptor.c
36733677
#: ports/nrf/common-hal/_bleio/Characteristic.c
36743678
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/fr.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3739,6 +3739,10 @@ msgstr "erreur de domaine math"
37393739
msgid "matrix is not positive definite"
37403740
msgstr "la matrice n'est pas définie positive"
37413741

3742+
#: shared-bindings/wifi/Radio.c
3743+
msgid "max_connections must be between 0 and 10"
3744+
msgstr ""
3745+
37423746
#: ports/espressif/common-hal/_bleio/Descriptor.c
37433747
#: ports/nrf/common-hal/_bleio/Characteristic.c
37443748
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/hi.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3630,6 +3630,10 @@ msgstr ""
36303630
msgid "matrix is not positive definite"
36313631
msgstr ""
36323632

3633+
#: shared-bindings/wifi/Radio.c
3634+
msgid "max_connections must be between 0 and 10"
3635+
msgstr ""
3636+
36333637
#: ports/espressif/common-hal/_bleio/Descriptor.c
36343638
#: ports/nrf/common-hal/_bleio/Characteristic.c
36353639
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/it_IT.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3687,6 +3687,10 @@ msgstr "errore di dominio matematico"
36873687
msgid "matrix is not positive definite"
36883688
msgstr ""
36893689

3690+
#: shared-bindings/wifi/Radio.c
3691+
msgid "max_connections must be between 0 and 10"
3692+
msgstr ""
3693+
36903694
#: ports/espressif/common-hal/_bleio/Descriptor.c
36913695
#: ports/nrf/common-hal/_bleio/Characteristic.c
36923696
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/ja.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3650,6 +3650,10 @@ msgstr "定義域エラー"
36503650
msgid "matrix is not positive definite"
36513651
msgstr "正定値行列ではありません"
36523652

3653+
#: shared-bindings/wifi/Radio.c
3654+
msgid "max_connections must be between 0 and 10"
3655+
msgstr ""
3656+
36533657
#: ports/espressif/common-hal/_bleio/Descriptor.c
36543658
#: ports/nrf/common-hal/_bleio/Characteristic.c
36553659
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/ko.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3634,6 +3634,10 @@ msgstr ""
36343634
msgid "matrix is not positive definite"
36353635
msgstr ""
36363636

3637+
#: shared-bindings/wifi/Radio.c
3638+
msgid "max_connections must be between 0 and 10"
3639+
msgstr ""
3640+
36373641
#: ports/espressif/common-hal/_bleio/Descriptor.c
36383642
#: ports/nrf/common-hal/_bleio/Characteristic.c
36393643
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/nl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3670,6 +3670,10 @@ msgstr "fout in het wiskundig domein (math domain error)"
36703670
msgid "matrix is not positive definite"
36713671
msgstr "matrix is niet positief-definiet"
36723672

3673+
#: shared-bindings/wifi/Radio.c
3674+
msgid "max_connections must be between 0 and 10"
3675+
msgstr ""
3676+
36733677
#: ports/espressif/common-hal/_bleio/Descriptor.c
36743678
#: ports/nrf/common-hal/_bleio/Characteristic.c
36753679
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/pl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3642,6 +3642,10 @@ msgstr "błąd domeny"
36423642
msgid "matrix is not positive definite"
36433643
msgstr ""
36443644

3645+
#: shared-bindings/wifi/Radio.c
3646+
msgid "max_connections must be between 0 and 10"
3647+
msgstr ""
3648+
36453649
#: ports/espressif/common-hal/_bleio/Descriptor.c
36463650
#: ports/nrf/common-hal/_bleio/Characteristic.c
36473651
#: ports/nrf/common-hal/_bleio/Descriptor.c

‎locale/pt_BR.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2022-02-11 10:58+0000\n"
9+
"PO-Revision-Date: 2022-02-15 18:42+0000\n"
1010
"Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
1111
"Language-Team: \n"
1212
"Language: pt_BR\n"
@@ -3727,6 +3727,10 @@ msgstr "erro de domínio matemático"
37273727
msgid "matrix is not positive definite"
37283728
msgstr "a matriz não é definitiva positiva"
37293729

3730+
#: shared-bindings/wifi/Radio.c
3731+
msgid "max_connections must be between 0 and 10"
3732+
msgstr "max_connections deve estar entre 0 e 10"
3733+
37303734
#: ports/espressif/common-hal/_bleio/Descriptor.c
37313735
#: ports/nrf/common-hal/_bleio/Characteristic.c
37323736
#: ports/nrf/common-hal/_bleio/Descriptor.c

0 commit comments

Comments
 (0)