Skip to content

Commit 568c04e

Browse files
authored
Merge pull request #650 from tannewt/merge_2x
Merge in commits from 2.x branch.
2 parents 6a2379f + ea63311 commit 568c04e

File tree

322 files changed

+776
-52121
lines changed

Some content is hidden

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

322 files changed

+776
-52121
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
- TRAVIS_BOARD=feather52
2121
- TRAVIS_TEST=qemu
2222
- TRAVIS_TEST=unix
23+
- TRAVIS_TEST=docs
2324

2425
addons:
2526
artifacts:
@@ -28,12 +29,6 @@ addons:
2829
target_paths: /
2930

3031
notifications:
31-
webhooks:
32-
urls:
33-
- https://webhooks.gitter.im/e/c38b3bb3a3e131d955a1
34-
on_success: change # options: [always|never|change] default: always
35-
on_failure: always # options: [always|never|change] default: always
36-
on_start: never # options: [always|never|change] default: always
3732
webhooks:
3833
urls:
3934
- https://rosie-ci.ngrok.io/travis
@@ -56,6 +51,7 @@ before_script:
5651
- ([[ $TRAVIS_BOARD != "feather52" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
5752
# For coverage testing (upgrade is used to get latest urllib3 version)
5853
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
54+
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)
5955
- gcc --version
6056
- ([[ -z "$TRAVIS_BOARD" ]] || arm-none-eabi-gcc --version)
6157
- python3 --version
@@ -101,6 +97,11 @@ script:
10197
- ([[ $TRAVIS_TEST != "unix" ]] || (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float))
10298
- echo -en 'travis_fold:end:test_mpy\\r'
10399

100+
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
101+
- ([[ $TRAVIS_TEST != "docs" ]] || sphinx-build -E -W -b html . _build/html)
102+
- echo -en 'travis_fold:end:build_docs\\r'
103+
104+
104105
# run coveralls coverage analysis (try to, even if some builds/tests failed)
105106
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
106107

CODECONVENTIONS.md

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)