Merge 636e127 into 5025eb1

johnbywater · Sep 20, 2017 · e82da8f · e82da8f
2 parents 5025eb1 + 636e127
commit e82da8f
Show file tree

Hide file tree

Showing 61 changed files with 1,867 additions and 1,678 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -4,3 +4,4 @@ omit =
     */python?.?/*
     */test_?.py
     */tests/*
+    */quantdsl/lib/*
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
 
 before_install:
 - travis_retry wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh