Skip to content

Commit 6a7742b

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into floppy
2 parents 31febc3 + 53b6c4b commit 6a7742b

103 files changed

Lines changed: 3165 additions & 584 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
zip -9r circuitpython-stubs.zip circuitpython-stubs
242242
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
243243
- name: Upload stubs to PyPi
244-
if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
244+
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
245245
env:
246246
TWINE_USERNAME: ${{ secrets.pypi_username }}
247247
TWINE_PASSWORD: ${{ secrets.pypi_password }}

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
149149
[submodule "ports/espressif/esp-idf"]
150150
path = ports/espressif/esp-idf
151-
url = https://github.com/espressif/esp-idf.git
151+
url = https://github.com/adafruit/esp-idf.git
152152
branch = release/v4.4
153153
[submodule "ports/espressif/certificates/nina-fw"]
154154
path = ports/espressif/certificates/nina-fw

‎BUILDING.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ https://learn.adafruit.com/building-circuitpython/
1515

1616
## Setup
1717

18-
Please ensure you setup your build environment appropriately, as per the guide. You will need:
18+
Please ensure you set up your build environment appropriately, as per the guide. You will need:
1919

2020
* Linux: https://learn.adafruit.com/building-circuitpython/linux
2121
* MacOS: https://learn.adafruit.com/building-circuitpython/macos
@@ -25,8 +25,9 @@ Please ensure you setup your build environment appropriately, as per the guide.
2525

2626
This project has a bunch of git submodules. You will need to update them regularly.
2727

28-
git submodule sync
29-
git submodule update --init
28+
In the root folder of the CircuitPython repository, execute the following:
29+
30+
make fetch-submodules
3031

3132
### Required Python Packages
3233

‎docs/library/re.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ Supported operators and special sequences are:
9595

9696
Example::
9797

98-
import ure
98+
import re
9999

100-
# As ure doesn't support escapes itself, use of r"" strings is not
100+
# As re doesn't support escapes itself, use of r"" strings is not
101101
# recommended.
102-
regex = ure.compile("[\r\n]")
102+
regex = re.compile("[\r\n]")
103103

104104
regex.split("line1\rline2\nline3\r\n")
105105

‎docs/templates/breadcrumbs.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{%- extends "sphinx_rtd_theme/breadcrumbs.html" %}
2+
3+
{% block breadcrumbs_aside %}
4+
{% endblock %}

‎extmod/ulab‎

Submodule ulab updated 99 files

‎locale/ID.po‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2661,7 +2661,7 @@ msgstr "berusaha mendapatkan argmin/argmax dari urutan kosong"
26612661
msgid "attributes not supported yet"
26622662
msgstr "atribut belum didukung"
26632663

2664-
#: extmod/ulab/code/numpy/numerical.c
2664+
#: extmod/ulab/code/ulab_tools.c
26652665
msgid "axis is out of bounds"
26662666
msgstr ""
26672667

@@ -2717,11 +2717,11 @@ msgstr ""
27172717
msgid "branch not in range"
27182718
msgstr ""
27192719

2720-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2720+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
27212721
msgid "buffer is smaller than requested size"
27222722
msgstr ""
27232723

2724-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2724+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
27252725
msgid "buffer size must be a multiple of element size"
27262726
msgstr ""
27272727

@@ -2813,6 +2813,10 @@ msgstr ""
28132813
msgid "can't convert '%q' object to %q implicitly"
28142814
msgstr ""
28152815

2816+
#: extmod/ulab/code/numpy/vector.c
2817+
msgid "can't convert complex to float"
2818+
msgstr ""
2819+
28162820
#: py/obj.c
28172821
msgid "can't convert to %q"
28182822
msgstr ""
@@ -2907,6 +2911,14 @@ msgstr ""
29072911
msgid "cannot cast output with casting rule"
29082912
msgstr ""
29092913

2914+
#: extmod/ulab/code/ndarray.c
2915+
msgid "cannot convert complex to dtype"
2916+
msgstr ""
2917+
2918+
#: extmod/ulab/code/ndarray.c
2919+
msgid "cannot convert complex type"
2920+
msgstr ""
2921+
29102922
#: py/objtype.c
29112923
msgid "cannot create '%q' instances"
29122924
msgstr ""
@@ -3098,6 +3110,10 @@ msgstr ""
30983110
msgid "divisor must be 4"
30993111
msgstr ""
31003112

3113+
#: extmod/ulab/code/numpy/vector.c
3114+
msgid "dtype must be float, or complex"
3115+
msgstr ""
3116+
31013117
#: py/objdeque.c
31023118
msgid "empty"
31033119
msgstr ""
@@ -3201,7 +3217,7 @@ msgstr ""
32013217
msgid "first argument must be a function"
32023218
msgstr ""
32033219

3204-
#: extmod/ulab/code/ulab_create.c
3220+
#: extmod/ulab/code/numpy/create.c
32053221
msgid "first argument must be a tuple of ndarrays"
32063222
msgstr ""
32073223

@@ -3266,6 +3282,10 @@ msgstr ""
32663282
msgid "function is defined for ndarrays only"
32673283
msgstr ""
32683284

3285+
#: extmod/ulab/code/numpy/carray/carray.c
3286+
msgid "function is implemented for ndarrays only"
3287+
msgstr ""
3288+
32693289
#: py/argcheck.c
32703290
#, c-format
32713291
msgid "function missing %d required positional arguments"
@@ -3379,22 +3399,26 @@ msgstr "inline assembler harus sebuah fungsi"
33793399
msgid "input and output shapes are not compatible"
33803400
msgstr ""
33813401

3382-
#: extmod/ulab/code/ulab_create.c
3402+
#: extmod/ulab/code/numpy/create.c
33833403
msgid "input argument must be an integer, a tuple, or a list"
33843404
msgstr ""
33853405

33863406
#: extmod/ulab/code/numpy/fft/fft_tools.c
33873407
msgid "input array length must be power of 2"
33883408
msgstr ""
33893409

3390-
#: extmod/ulab/code/ulab_create.c
3410+
#: extmod/ulab/code/numpy/create.c
33913411
msgid "input arrays are not compatible"
33923412
msgstr ""
33933413

33943414
#: extmod/ulab/code/numpy/poly.c
33953415
msgid "input data must be an iterable"
33963416
msgstr ""
33973417

3418+
#: extmod/ulab/code/numpy/vector.c
3419+
msgid "input dtype must be float or complex"
3420+
msgstr ""
3421+
33983422
#: extmod/ulab/code/numpy/linalg/linalg.c
33993423
msgid "input matrix is asymmetric"
34003424
msgstr ""
@@ -3404,18 +3428,26 @@ msgstr ""
34043428
msgid "input matrix is singular"
34053429
msgstr ""
34063430

3431+
#: extmod/ulab/code/numpy/carray/carray.c
3432+
msgid "input must be a 1D ndarray"
3433+
msgstr ""
3434+
34073435
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
34083436
msgid "input must be a dense ndarray"
34093437
msgstr ""
34103438

3411-
#: extmod/ulab/code/ulab_create.c
3439+
#: extmod/ulab/code/numpy/create.c
34123440
msgid "input must be a tensor of rank 2"
34133441
msgstr ""
34143442

3415-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c
3443+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
34163444
msgid "input must be an ndarray"
34173445
msgstr ""
34183446

3447+
#: extmod/ulab/code/numpy/carray/carray.c
3448+
msgid "input must be an ndarray, or a scalar"
3449+
msgstr ""
3450+
34193451
#: extmod/ulab/code/scipy/signal/signal.c
34203452
msgid "input must be one-dimensional"
34213453
msgstr ""
@@ -3786,7 +3818,11 @@ msgstr ""
37863818
msgid "not enough arguments for format string"
37873819
msgstr ""
37883820

3789-
#: extmod/ulab/code/ulab_create.c
3821+
#: extmod/ulab/code/numpy/carray/carray_tools.c
3822+
msgid "not implemented for complex dtype"
3823+
msgstr ""
3824+
3825+
#: extmod/ulab/code/numpy/create.c
37903826
msgid "number of points must be at least 2"
37913827
msgstr ""
37923828

@@ -3844,15 +3880,15 @@ msgstr ""
38443880
msgid "odd-length string"
38453881
msgstr "panjang data string memiliki keganjilan (odd-length)"
38463882

3847-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
3883+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
38483884
msgid "offset is too large"
38493885
msgstr ""
38503886

38513887
#: shared-bindings/dualbank/__init__.c
38523888
msgid "offset must be >= 0"
38533889
msgstr ""
38543890

3855-
#: extmod/ulab/code/ulab_create.c
3891+
#: extmod/ulab/code/numpy/create.c
38563892
msgid "offset must be non-negative and no greater than buffer length"
38573893
msgstr ""
38583894

@@ -4332,7 +4368,7 @@ msgstr ""
43324368
msgid "too many arguments provided with the given format"
43334369
msgstr ""
43344370

4335-
#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c
4371+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
43364372
msgid "too many dimensions"
43374373
msgstr ""
43384374

@@ -4533,15 +4569,19 @@ msgstr "jendela harus <= interval"
45334569
msgid "wrong axis index"
45344570
msgstr "indeks sumbu salah"
45354571

4536-
#: extmod/ulab/code/ulab_create.c
4572+
#: extmod/ulab/code/numpy/create.c
45374573
msgid "wrong axis specified"
45384574
msgstr "sumbu yang ditentukan salah"
45394575

45404576
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
45414577
msgid "wrong input type"
45424578
msgstr "tipe input salah"
45434579

4544-
#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c
4580+
#: extmod/ulab/code/numpy/transform.c
4581+
msgid "wrong length of condition array"
4582+
msgstr ""
4583+
4584+
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
45454585
msgid "wrong number of arguments"
45464586
msgstr "jumlah argumen salah"
45474587

0 commit comments

Comments
 (0)