srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-02-05 20:09:39 +08:00
parent 02a71e7abf 50c14db17a
commit 776381a332
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -25,7 +25,7 @@ install:
- pip install -e . - pip install -e .
script: script:
- coverage run --source=artiq setup.py test - coverage run --source=artiq setup.py test
- make -C doc/manual html || true - make -C doc/manual html
- cd misoc; python make.py -X ../soc -t artiq build-headers build-bios; cd .. - cd misoc; python make.py -X ../soc -t artiq build-headers build-bios; cd ..
- make -C soc/runtime - make -C soc/runtime
- cd misoc; python make.py -X ../soc -t artiq build-bitstream; cd .. - cd misoc; python make.py -X ../soc -t artiq build-bitstream; cd ..

15
doc/manual/conf.py
View File

@ -16,6 +16,21 @@
import sys import sys
import os import os
from unittest.mock import MagicMock
class Mock(MagicMock):
@classmethod
def __getattr__(cls, name):
return Mock()
mock_modules = ["gbulb", "gi", "gi.repository", "cairoplot", "matplotlib"]
for module in mock_modules:
sys.modules[module] = Mock()
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here. # documentation root, use os.path.abspath to make it absolute, like shown here.