diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-01-09 10:36:38 -0500 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-01-09 10:36:38 -0500 |
| commit | 89af6660930ab977a491c7662458cc2d8ee37ee9 (patch) | |
| tree | b49ef6b432a93dfb982edf3f0be9f627964662f1 | |
| parent | 5fc28970b4e7f849cf95daacfecf534596de6c68 (diff) | |
fix sphinx complaint; more travis fold status reporting
| -rwxr-xr-x | .travis.yml | 24 | ||||
| -rw-r--r-- | ports/nrf/README.md | 2 | ||||
| -rw-r--r-- | shared-bindings/bleio/CharacteristicBuffer.c | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 073c21a89..9ffa4eaa6 100755 --- a/.travis.yml +++ b/.travis.yml @@ -86,8 +86,9 @@ before_script: script: # Build mpy-cross first because other builds depend on it. - echo 'Building mpy-cross' && echo -en 'travis_fold:start:mpy-cross\\r' - - make -C mpy-cross -j2 + - make -C mpy-cross -j2 ; echo "Building mpy-cross status $?" > status - echo -en 'travis_fold:end:mpy-cross\\r' + - cat status # Use unbuffered output because building all the releases can take a long time. # Travis will cancel the job if it sees no output for >10 minutes. @@ -95,8 +96,9 @@ script: - cd .. - echo 'Building unix' && echo -en 'travis_fold:start:unix\\r' - - (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) + - (! 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 - echo -en 'travis_fold:end:unix\\r' + - cat status # run tests without coverage info #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1) @@ -104,28 +106,34 @@ script: # run tests with coverage info - echo 'Test all' && echo -en 'travis_fold:start:test_all\\r' - - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) + - (! 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 - echo -en 'travis_fold:end:test_all\\r' + - cat status - echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r' - - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) + - (! 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 - echo -en 'travis_fold:end:test_threads\\r' + - cat status - echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r' - - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) + - (! 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 - echo -en 'travis_fold:end:test_native\\r' + - cat status - (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r') - - (! 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)) + - (! 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 - echo -en 'travis_fold:end:test_mpy\\r' + - cat status - (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r') - - (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) + - (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; echo "Building docs status: $?" >status - echo -en 'travis_fold:end:build_docs\\r' + - cat status - (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r') - - (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) + - (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo "Building translations status: $?" >status - echo -en 'travis_fold:end:build_translations\\r' + - cat status # run coveralls coverage analysis (try to, even if some builds/tests failed) #- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod) diff --git a/ports/nrf/README.md b/ports/nrf/README.md index c385459c3..e909368b6 100644 --- a/ports/nrf/README.md +++ b/ports/nrf/README.md @@ -103,7 +103,7 @@ run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Ada * dfu-gen: Generates a Firmware zip to be used by the DFU flash application. * dfu-flash: Triggers the DFU flash application to upload the firmware from the generated Firmware zip file. -Example on how to generate and flash feather_nrf52832 target: +Example on how to generate and flash feather_nrf52840 target: make BOARD=feather_nrf52840 SD=s140 make BOARD=feather_nrf52840 SD=s140 dfu-gen dfu-flash diff --git a/shared-bindings/bleio/CharacteristicBuffer.c b/shared-bindings/bleio/CharacteristicBuffer.c index 770594d3a..74ca609f0 100644 --- a/shared-bindings/bleio/CharacteristicBuffer.c +++ b/shared-bindings/bleio/CharacteristicBuffer.c @@ -32,7 +32,7 @@ //| .. currentmodule:: bleio //| //| :class:`CharacteristicBuffer` -- GATT Service incoming values buffer. -//| ========================================================= +//| ===================================================================== //| //| Accumulates a Characteristic's incoming values in a FIFO buffer. //| |
