Merge branch 'release/1.1.0'

johnbywater · Sep 20, 2017 · 2a690a3 · 2a690a3
2 parents 1a13de6 + b1601bc
commit 2a690a3
Show file tree

Hide file tree

Showing 101 changed files with 3,329 additions and 6,032 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -4,3 +4,4 @@ omit =
     */python?.?/*
     */test_?.py
     */tests/*
+    */quantdsl/lib/*
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@ build/
 develop-eggs/
 dist/
 eggs/
-lib/
 lib64/
 parts/
 sdist/

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
@@ -24,7 +25,7 @@ install:
 - pip install python-coveralls
 
 script:
-- coverage run -m unittest discover quantdsl -v
+- coverage run -m unittest discover quantdsl.tests -v
 
 after_success:
 - coveralls