Skip to content

Commit c76a4d4

Browse files
committed
remove qemu-arm build; fix docs build bugs
1 parent bfbb5cd commit c76a4d4

File tree

10 files changed

+13
-77
lines changed

10 files changed

+13
-77
lines changed

.travis.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ env:
2626
- TRAVIS_BOARD=gemma_m0
2727
- TRAVIS_BOARD=feather52832
2828
- TRAVIS_BOARD=pca10056
29-
- TRAVIS_TEST=qemu
3029
- TRAVIS_TEST=unix
3130
- TRAVIS_TEST=docs
3231

@@ -49,9 +48,8 @@ notifications:
4948
before_script:
5049
- sudo dpkg --add-architecture i386
5150

52-
- ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y qemu-system)
5351
- ([[ -z "$TRAVIS_BOARD" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
54-
- ([[ $TRAVIS_TEST != "qemu" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
52+
- wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb
5553

5654
# For nrf builds
5755
- ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh)
@@ -80,10 +78,6 @@ script:
8078
- ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix coverage -j2)
8179
- echo -en 'travis_fold:end:unix\\r'
8280

83-
- echo 'Building qemu' && echo -en 'travis_fold:start:qemu\\r'
84-
- ([[ $TRAVIS_TEST != "qemu" ]] || make -C ports/qemu-arm test -j2)
85-
- echo -en 'travis_fold:end:qemu\\r'
86-
8781
# run tests without coverage info
8882
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1)
8983
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native)
@@ -115,4 +109,3 @@ script:
115109

116110
after_failure:
117111
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
118-
- (grep "FAIL" ports/qemu-arm/build/console.out)

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
"ports/cc3200",
109109
"ports/cc3200/FreeRTOS",
110110
"ports/cc3200/hal",
111+
"ports/esp32",
111112
"ports/esp8266/boards",
112113
"ports/esp8266/common-hal",
113114
"ports/esp8266/modules",

docs/library/_thread.rst

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

docs/library/btree.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:synopsis: simple BTree database
88

99
The ``btree`` module implements a simple key-value database using external
10-
storage (disk files, or in general case, a random-access `stream`). Keys are
10+
storage (disk files, or in general case, a random-access ``stream``). Keys are
1111
stored sorted in the database, and besides efficient retrieval by a key
1212
value, a database also supports efficient ordered range scans (retrieval
1313
of values with the keys in a given range). On the application interface

docs/library/micropython.rst

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,6 @@ Functions
4747

4848
The default optimisation level is usually level 0.
4949

50-
.. function:: alloc_emergency_exception_buf(size)
51-
52-
Allocate *size* bytes of RAM for the emergency exception buffer (a good
53-
size is around 100 bytes). The buffer is used to create exceptions in cases
54-
when normal RAM allocation would fail (eg within an interrupt handler) and
55-
therefore give useful traceback information in these situations.
56-
57-
A good way to use this function is to put it at the start of your main script
58-
(eg ``boot.py`` or ``main.py``) and then the emergency exception buffer will be active
59-
for all the code following it.
60-
6150
.. function:: mem_info([verbose])
6251

6352
Print information about currently used memory. If the *verbose* argument
@@ -102,38 +91,3 @@ Functions
10291
This function can be used to prevent the capturing of Ctrl-C on the
10392
incoming stream of characters that is usually used for the REPL, in case
10493
that stream is used for other purposes.
105-
106-
.. function:: schedule(func, arg)
107-
108-
Schedule the function *func* to be executed "very soon". The function
109-
is passed the value *arg* as its single argument. "Very soon" means that
110-
the MicroPython runtime will do its best to execute the function at the
111-
earliest possible time, given that it is also trying to be efficient, and
112-
that the following conditions hold:
113-
114-
- A scheduled function will never preempt another scheduled function.
115-
- Scheduled functions are always executed "between opcodes" which means
116-
that all fundamental Python operations (such as appending to a list)
117-
are guaranteed to be atomic.
118-
- A given port may define "critical regions" within which scheduled
119-
functions will never be executed. Functions may be scheduled within
120-
a critical region but they will not be executed until that region
121-
is exited. An example of a critical region is a preempting interrupt
122-
handler (an IRQ).
123-
124-
A use for this function is to schedule a callback from a preempting IRQ.
125-
Such an IRQ puts restrictions on the code that runs in the IRQ (for example
126-
the heap may be locked) and scheduling a function to call later will lift
127-
those restrictions.
128-
129-
Note: If `schedule()` is called from a preempting IRQ, when memory
130-
allocation is not allowed and the callback to be passed to `schedule()` is
131-
a bound method, passing this directly will fail. This is because creating a
132-
reference to a bound method causes memory allocation. A solution is to
133-
create a reference to the method in the class constructor and to pass that
134-
reference to `schedule()`. This is discussed in detail here
135-
:ref:`reference documentation <isr_rules>` under "Creation of Python
136-
objects".
137-
138-
There is a finite stack to hold the scheduled functions and `schedule()`
139-
will raise a `RuntimeError` if the stack is full.

docs/library/sys.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ Constants
105105

106106
.. data:: stderr
107107

108-
Standard error `stream`.
108+
Standard error ``stream``.
109109

110110
.. data:: stdin
111111

112-
Standard input `stream`.
112+
Standard input ``stream``.
113113

114114
.. data:: stdout
115115

116-
Standard output `stream`.
116+
Standard output ``stream``.
117117

118118
.. data:: version
119119

docs/library/uselect.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
|see_cpython_module| :mod:`cpython:select`.
1010

1111
This module provides functions to efficiently wait for events on multiple
12-
`streams <stream>` (select streams which are ready for operations).
12+
``stream`` objects (select streams which are ready for operations).
1313

1414
Functions
1515
---------
@@ -35,7 +35,7 @@ Methods
3535

3636
.. method:: poll.register(obj[, eventmask])
3737

38-
Register `stream` *obj* for polling. *eventmask* is logical OR of:
38+
Register ``stream`` *obj* for polling. *eventmask* is logical OR of:
3939

4040
* ``uselect.POLLIN`` - data available for reading
4141
* ``uselect.POLLOUT`` - more data can be written

docs/library/usocket.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This module provides access to the BSD socket interface.
1414
.. admonition:: Difference to CPython
1515
:class: attention
1616

17-
For efficiency and consistency, socket objects in MicroPython implement a `stream`
17+
For efficiency and consistency, socket objects in MicroPython implement a ``stream``
1818
(file-like) interface directly. In CPython, you need to convert a socket to
1919
a file-like object using `makefile()` method. This method is still supported
2020
by MicroPython (but is a no-op), so where compatibility with CPython matters,
@@ -245,7 +245,7 @@ Methods
245245
Not every ``MicroPython port`` supports this method. A more portable and
246246
generic solution is to use `uselect.poll` object. This allows to wait on
247247
multiple objects at the same time (and not just on sockets, but on generic
248-
`stream` objects which support polling). Example::
248+
``stream`` objects which support polling). Example::
249249

250250
# Instead of:
251251
s.settimeout(1.0) # time in seconds

docs/library/ussl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Functions
1717

1818
.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)
1919

20-
Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
20+
Takes a ``stream`` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
2121
and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
22-
an SSL context. Returned object has the usual `stream` interface methods like
22+
an SSL context. Returned object has the usual ``stream`` interface methods like
2323
``read()``, ``write()``, etc. In MicroPython, the returned object does not expose
2424
socket interface and methods like ``recv()``, ``send()``. In particular, a
2525
server-side SSL socket should be created from a normal socket returned from

docs/library/uzlib.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Functions
2727

2828
.. class:: DecompIO(stream, wbits=0)
2929

30-
Create a `stream` wrapper which allows transparent decompression of
30+
Create a ``stream`` wrapper which allows transparent decompression of
3131
compressed data in another *stream*. This allows to process compressed
3232
streams with data larger than available heap size. In addition to
3333
values described in :func:`decompress`, *wbits* may take values

0 commit comments

Comments
 (0)