Merge pull request #423 from BBN-Q/develop

2019.2 Minor Tweaks

.travis.yml

@@ -5,8 +5,8 @@ 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
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh UPDATE_CONDA="true"
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh UPDATE_CONDA=""
 
 addons:
   apt:
@@ -24,8 +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
+  - if [ $UPDATE_CONDA ]; then conda update -q conda; fi
   # Useful for debugging any issues with conda
   - conda info -a
 

doc/conf.py

@@ -44,6 +44,8 @@
     'sphinx.ext.napoleon',
 ]
 
+nbsphinx_execute = 'never'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -70,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.8'
+version = '2019.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.8'
+release = '2019.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/examples/QubitExperiments/APS2-2Q-Example.ipynb → doc/examples/Example-APS2-2Qubit.ipynb

@@ -1,5 +1,15 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Example Q8: Realistic Two Qubit Tuneup and Experiments\n",
+    "This example notebook shows how to use APS2/X6 ecosystem to tune up a pair of qubits.\n",
+    "\n",
+    "© Raytheon BBN Technologies 2019"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -116,9 +126,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "pl = PipelineManager()\n",
@@ -241,9 +249,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "pf = PulsedSpec(qb, specOn=True)\n",
@@ -466,9 +472,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "pf = RabiWidth(q2, np.arange(20e-9, 0.602e-6, 10e-9))\n",
@@ -1073,9 +1077,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "crlens = np.arange(100e-9,2.1e-6,100e-9)\n",
@@ -1123,9 +1125,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "phases = np.arange(0,np.pi*2,np.pi/20)\n",
@@ -1211,7 +1211,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.4"
+   "version": "3.7.3"
   },
   "latex_envs": {
    "bibliofile": "biblio.bib",
@@ -1232,5 +1232,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }

doc/qubits.rst

@@ -29,6 +29,7 @@ The best way to gain experience is to follow through with these tutorials:
    Q5 Tutorial: Adding Sweeps to Experiments <examples/Example-Sweeps.ipynb>
    Q6 Tutorial: Pulse Calibration <examples/Example-Calibrations.ipynb>
    Q7 Tutorial: Single Shot Fidelity <examples/Example-SingleShot-Fid.ipynb>
+   Q8 Tutorial: Realistic Two Qubit Tuneup and Experiments <examples/Example-APS2-2Qubit.ipynb>
 
 Instrument Drivers
 ******************

setup.py

@@ -43,7 +43,7 @@
 
 setup(
     name='auspex',
-    version='2019.1',
+    version='2019.2',
     author='Auspex Developers',
     package_dir={'':'src'},
     packages=[