Merge pull request #398 from BBN-Q/develop

2019.2 Preparation
BBN-Q · Oct 28, 2019 · 66ea223 · 66ea223
2 parents c78558f + e9271fa
commit 66ea223
Show file tree

Hide file tree

Showing 44 changed files with 3,385 additions and 433 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,7 @@ install:
   # - echo "Database file at $BBN_DB"
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
+  - conda install -c anaconda setuptools
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
@@ -35,7 +36,7 @@ install:
   - pip install git+https://github.com/BBN-Q/bbndb.git
   - pip install git+https://github.com/BBN-Q/QGL.git@develop
   - pip install git+https://github.com/spatialaudio/nbsphinx.git@master
-  - pip install pyvisa coveralls scikit-learn pyusb future python-usbtmc setproctitle
+  - pip install pyvisa coveralls scikit-learn pyusb future python-usbtmc setproctitle progress serial
   - export GIT_LFS_SKIP_SMUDGE=0
   - export PYTHONPATH=$PYTHONPATH:$PWD/src
 

diff --git a/doc/example.sqlite b/doc/example.sqlite
diff --git a/doc/examples/Example-Q6.ipynb → doc/examples/Example-Calibrations.ipynb b/doc/examples/Example-Q6.ipynb → doc/examples/Example-Calibrations.ipynb
diff --git a/doc/examples/Example-Q2.ipynb → doc/examples/Example-Channel-Lib.ipynb b/doc/examples/Example-Q2.ipynb → doc/examples/Example-Channel-Lib.ipynb
diff --git a/doc/examples/Example-Q1.ipynb → doc/examples/Example-Config.ipynb b/doc/examples/Example-Q1.ipynb → doc/examples/Example-Config.ipynb
diff --git a/doc/examples/Example-Q4.ipynb → doc/examples/Example-Experiments.ipynb b/doc/examples/Example-Q4.ipynb → doc/examples/Example-Experiments.ipynb
diff --git a/doc/examples/Example-Q3.ipynb → doc/examples/Example-Filter-Pipeline.ipynb b/doc/examples/Example-Q3.ipynb → doc/examples/Example-Filter-Pipeline.ipynb
diff --git a/doc/examples/Example-Q7.ipynb → doc/examples/Example-SingleShot-Fid.ipynb b/doc/examples/Example-Q7.ipynb → doc/examples/Example-SingleShot-Fid.ipynb
diff --git a/doc/examples/Example-Q5.ipynb → doc/examples/Example-Sweeps.ipynb b/doc/examples/Example-Q5.ipynb → doc/examples/Example-Sweeps.ipynb