Skip to content

Commit 493f6c6

Browse files
authored
Merge pull request #452 from RobertoRoos/release/v0.54
Adding branch release/v0.54 to suit version 0.54.6
2 parents 7f2c1ae + f2bfd79 commit 493f6c6

File tree

4 files changed

+77
-4
lines changed

4 files changed

+77
-4
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ on:
1313
types: [rerequested]
1414

1515
jobs:
16-
test:
16+
micropython:
1717
runs-on: ubuntu-16.04
1818
steps:
1919
- name: Dump GitHub context
2020
env:
2121
GITHUB_CONTEXT: ${{ toJson(github) }}
2222
run: echo "$GITHUB_CONTEXT"
23-
- name: Set up Python 3.5
23+
- name: Set up Python 3.8
2424
uses: actions/setup-python@v1
2525
with:
26-
python-version: 3.5
26+
python-version: 3.8
2727

2828
- name: Versions
2929
run: |
@@ -60,3 +60,30 @@ jobs:
6060
done
6161
if: failure()
6262

63+
circuitpython:
64+
runs-on: ubuntu-16.04
65+
steps:
66+
- name: Dump GitHub context
67+
env:
68+
GITHUB_CONTEXT: ${{ toJson(github) }}
69+
run: echo "$GITHUB_CONTEXT"
70+
- name: Set up Python 3.5
71+
uses: actions/setup-python@v1
72+
with:
73+
python-version: 3.8
74+
75+
- name: Versions
76+
run: |
77+
gcc --version
78+
python3 --version
79+
80+
- name: Checkout ulab
81+
uses: actions/checkout@v1
82+
83+
- name: Install requirements
84+
run: |
85+
sudo apt install librsvg2-bin gettext
86+
pip install "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter astroid isort polib black
87+
88+
- name: Run build-cp.sh
89+
run: ./build-cp.sh

.readthedocs.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Set the version of Python and other tools you might need
9+
build:
10+
os: ubuntu-20.04
11+
tools:
12+
python: "3.9"
13+
14+
# Build documentation in the docs/ directory with Sphinx
15+
sphinx:
16+
configuration: docs/manual/source/conf.py
17+
18+
# If using Sphinx, optionally build your docs in additional formats such as PDF
19+
# formats:
20+
# - pdf
21+
22+
# Optionally declare the Python requirements required to build your docs
23+
#python:
24+
# install:
25+
# - requirements: requirements.txt
26+
# No requirements.txt for this version

build-cp.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/sh
2+
set -e
3+
nproc=$(python -c 'import multiprocessing; print(multiprocessing.cpu_count())')
4+
HERE="$(dirname -- "$(readlink -f -- "${0}")" )"
5+
[ -e circuitpython/py/py.mk ] || (git clone --depth 100 --branch 6.0.x https://github.com/adafruit/circuitpython && cd circuitpython && git submodule update --init)
6+
rm -rf circuitpython/extmod/ulab; ln -s "$HERE" circuitpython/extmod/ulab
7+
make -C circuitpython/mpy-cross -j$nproc
8+
make -C circuitpython/ports/unix -j$nproc deplibs
9+
make -C circuitpython/ports/unix -j$nproc
10+
11+
if ! env MICROPY_MICROPYTHON=circuitpython/ports/unix/micropython circuitpython/tests/run-tests -d tests; then
12+
for exp in *.exp; do
13+
testbase=$(basename $exp .exp);
14+
echo -e "\nFAILURE $testbase";
15+
diff -u $testbase.exp $testbase.out;
16+
done
17+
exit 1
18+
fi
19+
20+
(cd circuitpython && sphinx-build -E -W -b html . _build/html)

code/ndarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ mp_uint_t ndarray_print_edgeitems = NDARRAY_PRINT_EDGEITEMS;
167167
//| ...
168168
//|
169169
//| _ArrayLike = Union[array, List[_float], Tuple[_float], range]
170-
//| """`ulab.array`, `List[float]`, `Tuple[float]` or `range`"""
170+
//| """`ulab.array`, ``List[float]``, ``Tuple[float]`` or `range`"""
171171
//|
172172
//| int8: _DType
173173
//| """Type code for signed integers in the range -128 .. 127 inclusive, like the 'b' typecode of `array.array`"""

0 commit comments

Comments
 (0)