Add example notebook

qucontrol · Dec 2, 2018 · 96c5a22 · 96c5a22
1 parent 766024c
commit 96c5a22
Show file tree

Hide file tree

Showing 5 changed files with 505 additions and 33 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -5,17 +5,16 @@ environment:
       MINICONDA: C:\Miniconda3
     - PYTHON_VERSION: 3.6
       MINICONDA: C:\Miniconda3
-    - PYTHON_VERSION: 3.7
-      MINICONDA: C:\Miniconda3
 
 install:
   - "%MINICONDA%\\Scripts\\activate"
   - conda config --set always_yes yes
-  - conda create -q -n test_env python=%PYTHON_VERSION% 
+  - conda create -q -n test_env python=%PYTHON_VERSION%
   - activate test_env
   - echo CONDA_PREFIX %CONDA_PREFIX%
   - echo PATH %PATH%
   - conda config --append channels conda-forge
+  - conda install qutip
   - pip install .[dev]
   - pip freeze
 

diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ install:
   - conda create -q -n test_env python=$TRAVIS_PYTHON_VERSION 
   - conda activate test_env
   - conda config --append channels conda-forge
+  - conda install qutip
   - pip install -e .[dev]
   - pip freeze
   - pip install coveralls

diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ test36: .venv/py36/bin/py.test ## run tests for Python 3.6
 	@.venv/py37/bin/pip install -e .[dev]
 
 test37: .venv/py37/bin/py.test ## run tests for Python 3.7
-	$(TESTENV) $< -v $(TESTOPTIONS) $(TESTS)
+	$(TESTENV) $< -v $(TESTOPTIONS) src tests docs/*.rst
 .venv/py37/bin/sphinx-build: .venv/py37/bin/py.test
 
 docs: .venv/py36/bin/sphinx-build ## generate Sphinx HTML documentation, including API docs
@@ -134,7 +134,7 @@ develop-docs: develop  ## generate Sphinx HTML documentation, including API docs
 # How to execute notebook files
 %.ipynb.log: %.ipynb .venv/py36/bin/jupyter
 	@echo ""
-	@.venv/py36/bin/jupyter nbconvert --to notebook --execute --inplace --allow-errors --ExecutePreprocessor.kernel_name='python3' --config=/dev/null $< 2>&1 | tee $@
+	@.venv/py36/bin/jupyter nbconvert --to notebook --execute --inplace --allow-errors --ExecutePreprocessor.timeout=300 --ExecutePreprocessor.kernel_name='python3' --config=/dev/null $< 2>&1 | tee $@
 
 NOTEBOOKFILES = $(shell find docs/ -iname '*.ipynb'  -maxdepth 1)
 NOTEBOOKLOGS = $(patsubst %.ipynb,%.ipynb.log,$(NOTEBOOKFILES))

diff --git a/docs/example.ipynb b/docs/example.ipynb
diff --git a/docs/nbval_sanitize.cfg b/docs/nbval_sanitize.cfg
@@ -13,3 +13,7 @@ replace: TIME-STAMP
 [regex4]
 regex: id='[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'>
 replace: id='JUPYTERID'
+
+[regex5]
+regex: .*per loop .mean .* std. dev. of \d+ runs, \d+ loops? each.*
+replace: TIMEIT-result