Skip to content

Commit 89af666

Browse files
dhalbertdhalbert
committed
fix sphinx complaint; more travis fold status reporting
1 parent 5fc2897 commit 89af666

3 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎.travis.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,46 +86,54 @@ before_script:
8686
script:
8787
# Build mpy-cross first because other builds depend on it.
8888
- echo 'Building mpy-cross' && echo -en 'travis_fold:start:mpy-cross\\r'
89-
- make -C mpy-cross -j2
89+
- make -C mpy-cross -j2 ; echo "Building mpy-cross status $?" > status
9090
- echo -en 'travis_fold:end:mpy-cross\\r'
91+
- cat status
9192

9293
# Use unbuffered output because building all the releases can take a long time.
9394
# Travis will cancel the job if it sees no output for >10 minutes.
9495
- cd tools && python3 -u build_release_files.py
9596
- cd ..
9697

9798
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
98-
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2))
99+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; echo "Building unix status: $?" > status
99100
- echo -en 'travis_fold:end:unix\\r'
101+
- cat status
100102

101103
# run tests without coverage info
102104
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1)
103105
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native)
104106

105107
# run tests with coverage info
106108
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
107-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
109+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; echo "Test all status: $?" > status
108110
- echo -en 'travis_fold:end:test_all\\r'
111+
- cat status
109112

110113
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
111-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
114+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; echo "Test threads status: $?" >status
112115
- echo -en 'travis_fold:end:test_threads\\r'
116+
- cat status
113117

114118
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
115-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
119+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; echo "Testing with native: $?" >status
116120
- echo -en 'travis_fold:end:test_native\\r'
121+
- cat status
117122

118123
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
119-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
124+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float)) ; echo "Testing with mpy status: $?" >status
120125
- echo -en 'travis_fold:end:test_mpy\\r'
126+
- cat status
121127

122128
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
123-
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html)
129+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; echo "Building docs status: $?" >status
124130
- echo -en 'travis_fold:end:build_docs\\r'
131+
- cat status
125132

126133
- (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r')
127-
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate)
134+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo "Building translations status: $?" >status
128135
- echo -en 'travis_fold:end:build_translations\\r'
136+
- cat status
129137

130138
# run coveralls coverage analysis (try to, even if some builds/tests failed)
131139
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)

‎ports/nrf/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Ada
103103
* dfu-gen: Generates a Firmware zip to be used by the DFU flash application.
104104
* dfu-flash: Triggers the DFU flash application to upload the firmware from the generated Firmware zip file.
105105

106-
Example on how to generate and flash feather_nrf52832 target:
106+
Example on how to generate and flash feather_nrf52840 target:
107107

108108
make BOARD=feather_nrf52840 SD=s140
109109
make BOARD=feather_nrf52840 SD=s140 dfu-gen dfu-flash

‎shared-bindings/bleio/CharacteristicBuffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
//| .. currentmodule:: bleio
3333
//|
3434
//| :class:`CharacteristicBuffer` -- GATT Service incoming values buffer.
35-
//| =========================================================
35+
//| =====================================================================
3636
//|
3737
//| Accumulates a Characteristic's incoming values in a FIFO buffer.
3838
//|

0 commit comments

Comments
 (0)