Merge branch 'dev' of https://github.com/libtangle/qcgpu into dev

.travis.yml

@@ -0,0 +1,11 @@
+language: python # works on linux, not windows
+python:
+    - "3.6"
+
+install:
+    - pip3 install -r requirements-dev.txt
+    - python3 setup.py build_ext --inplace
+    - python3 setup.py install
+
+script:
+    - pytest tests

CMakeLists.txt

@@ -3,7 +3,7 @@ project(tangle_project)
 
 
 option(DISTRIBUTED "Use MPI" OFF)
-option(MULTITHREADED "Use OpenMP" ON)
+option(MULTITHREADED "Use OpenMP" OFF)
 
 
 if (NOT DEFINED ${TANGLE_LIB_PATH})

python/__init__.py

@@ -1 +1 @@
-from .pytangle import say_hi
+from .pytangle import say_hi, count

python/pytangle.pyx

@@ -6,3 +6,6 @@ cdef extern from "tangle.h":
 
 def say_hi():
     return count_to(5)
+
+def count(i):
+    return count_to(i)

requirements-dev.txt

@@ -0,0 +1,5 @@
+pytest
+scikit-build
+cython
+cmake
+ninja

setup.py

@@ -26,6 +26,5 @@ setup(
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Topic :: Scientific/Engineering",
-    ],
-    install_requires=['scikit-build', 'cython']
+    ]
 )

tests/test_other.py

@@ -0,0 +1,5 @@
+import pytest
+
+def test_random():
+    assert True
+