Merge pull request #374 from BBN-Q/master-merge

Master merge
BBN-Q · Jul 22, 2019 · 11bd315 · 11bd315
2 parents fd0f339 + 7e03b27
commit 11bd315
Show file tree

Hide file tree

Showing 163 changed files with 85,126 additions and 20,617 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 *.xml
 *.html
 *.h5
+*.dat
+*.auspex
+*_meta.json
 data/*
 doc/_build/*
 doc/make.bat

diff --git a/.travis.yml b/.travis.yml
@@ -4,36 +4,40 @@
 language: python
 python:
   - "3.6"
+env:
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh
+
+addons:
+  apt:
+    packages:
+    - libusb-1.0-0-dev
 
 install:
   # Setup anaconda. See http://conda.pydata.org/docs/travis.html
-
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+  - echo "Using $CONDA_TYPE"
+  - wget $CONDA_VERS -O miniconda.sh
+  - bash miniconda.sh -h | sed '4q;d'
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
-  - export BBN_MEAS_FILE="$PWD/test/test_measure.yml"
-  - echo "Measure file at $BBN_MEAS_FILE"
-  #
-  # Looking to resolve the Seg Fault occuring upon unit-test invocation.
-  # Update the package descriptions and install libusb
-  - sudo apt update
-  - sudo apt install libusb-1.0-0
-  #
+  # - export BBN_DB="$PWD/bbn.sqlite"
+  # - echo "Database file at $BBN_DB"
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
 
   # Create conda environment with dependencies
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib h5py pandas networkx cffi bokeh jupyter future psutil
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy h5py sphinx matplotlib pandas networkx cffi jupyter psutil sqlalchemy ipykernel ipywidgets
   - source activate test-environment
   - export GIT_LFS_SKIP_SMUDGE=1
+  - pip install git+https://github.com/BBN-Q/bbndb.git
   - pip install git+https://github.com/BBN-Q/Adapt.git
-  - pip install git+https://github.com/BBN-Q/QGL.git
-  - pip install tqdm pyvisa coveralls ruamel.yaml watchdog scikit-learn pyusb
+  - 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
   - export GIT_LFS_SKIP_SMUDGE=0
-  - conda install -c ecpy atom;
   - export PYTHONPATH=$PYTHONPATH:$PWD/src
 
 script:

diff --git a/calibration/AWG_20160718.csv b/calibration/AWG_20160718.csv
diff --git a/calibration/AWG_20160815.csv b/calibration/AWG_20160815.csv
diff --git a/calibration/AWG_20160901.csv b/calibration/AWG_20160901.csv
diff --git a/calibration/AWG_HPD_20160714_err.csv b/calibration/AWG_HPD_20160714_err.csv
diff --git a/calibration/GMW.cal b/calibration/GMW.cal
diff --git a/calibration/HallProbe.cal b/calibration/HallProbe.cal
diff --git a/calibration/RFSA2113SB.tsv b/calibration/RFSA2113SB.tsv
diff --git a/calibration/RFSA2113SB_HPD_20160706.csv b/calibration/RFSA2113SB_HPD_20160706.csv
diff --git a/calibration/RFSA2113SB_HPD_20160706.tsv b/calibration/RFSA2113SB_HPD_20160706.tsv
diff --git a/calibration/RFSA2113SB_HPD_20160815.csv b/calibration/RFSA2113SB_HPD_20160815.csv
diff --git a/calibration/RFSA2113SB_HPD_20160901.csv b/calibration/RFSA2113SB_HPD_20160901.csv
diff --git a/calibration/midpoint_20160718.csv b/calibration/midpoint_20160718.csv
diff --git a/calibration/nTron_20160715_err.csv b/calibration/nTron_20160715_err.csv
diff --git a/calibration/nTron_20160718.csv b/calibration/nTron_20160718.csv
diff --git a/calibration/nTron_20160815.csv b/calibration/nTron_20160815.csv
diff --git a/doc/ReadMe.txt b/doc/ReadMe.txt
diff --git a/doc/api/auspex.analysis.rst b/doc/api/auspex.analysis.rst
@@ -11,35 +11,13 @@ auspex\.analysis\.fits module
     :members:
     :undoc-members:
 
-auspex\.analysis\.h5shell module
---------------------------------
-
-.. automodule:: auspex.analysis.h5shell
-    :members:
-    :undoc-members:
-
 auspex\.analysis\.helpers module
 --------------------------------
 
 .. automodule:: auspex.analysis.helpers
     :members:
     :undoc-members:
 
-auspex\.analysis\.io module
----------------------------
-
-.. automodule:: auspex.analysis.io
-    :members:
-    :undoc-members:
-
-auspex\.analysis\.switching module
-----------------------------------
-
-.. automodule:: auspex.analysis.switching
-    :members:
-    :undoc-members:
-
-
 Module contents
 ---------------