Merge pull request #241 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=""
 
 before_install:
   # install git lfs and fetch test data
@@ -32,8 +32,7 @@ install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - 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
 

QGL/ChannelLibraries.py

@@ -150,9 +150,9 @@ def ls(self):
     def cal_ls(self):
         ''' List of auspex.pulse_calibration results '''
         caldb = bbndb.calibration.Calibration
-        c = self.session.query(caldb.sample_id, caldb.name, caldb.value, caldb.date).order_by(-Channels.ChannelDatabase.id).all()
+        c = self.session.query(caldb.sample_id, caldb.name, caldb.value, caldb.date).order_by(-caldb.sample_id).all()
         table_code = ""
-        for i, (id, sample_id, name, value, time) in enumerate(c):
+        for i, (sample_id, name, value, time) in enumerate(c):
             d,t  = str(time).split()
             sample = self.session.query(bbndb.calibration.Sample).filter_by(id=sample_id).first()
             table_code += f"<tr><td>{id}</td><td>{d}</td><td>{t.split('.')[0]}</td><td>{sample.name}</td><td>{name}</td><td>{round(value,9)}</td></tr>"

requirements.txt

@@ -1,4 +1,4 @@
-bbndb >= 0.1
+bbndb >= 2019.2
 numpy >= 1.11.1
 scipy >= 0.17.1
 networkx >= 1.11

setup.py

@@ -1,13 +1,13 @@
 from setuptools import setup, find_packages
 
 setup(name='QGL',
-      version='2019.1',
+      version='2019.2',
       packages=find_packages(exclude=["tests"]),
       url='https://github.com/BBN-Q/QGL',
       download_url='https://github.com/BBN-Q/QGL',
       license="Apache 2.0 License",
       install_requires=[
-        "bbndb >= 2019.1",
+        "bbndb >= 2019.2",
         "numpy >= 1.11.1",
         "scipy >= 0.17.1",
         "networkx >= 1.11",