Merge pull request #118 from bashtage/cython-coverage

BLD: Add coverage for Cython Code

Author: bashtage

.coveragerc

@@ -0,0 +1,25 @@
+# .coveragerc to control coverage.py
+[run]
+source = randomstate
+branch = True
+include = */randomstate/*
+omit =
+    */_version.py
+plugins = Cython.Coverage
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise NotImplementedError
+    except NotImplementedError
+    except AssertionError
+    # Ignore pass
+    pass
+include = */randomstate/*
+omit =
+    */_version.py
+ignore_errors = True

.travis.yml

@@ -17,13 +17,14 @@ matrix:
   - env:
     - PYTHON=2.7
     - NUMPY=1.9
-    - CYTHON=0.22
+    - CYTHON=0.25
   - env:
     - PYTHON=3.4
     - NUMPY=1.10
-    - CYTHON=0.24
+    - CYTHON=0.25
   - env:
     - PYTHON=3.5
+    - CYTHON=0.26
   - env:
     - PYTHON=3.6
 
@@ -43,14 +44,15 @@ before_install:
   - export BUILD_DIR=$PWD
   - conda create -n randomstate-test ${PKGS} pytest pip setuptools matplotlib pyyaml nose --quiet
   - source activate randomstate-test
-  - pip install tempita sphinx guzzle_sphinx_theme ipython -q
+  - pip install tempita sphinx guzzle_sphinx_theme ipython coverage coveralls pytest-cov codecov -q
+  - export CYTHON_COVERAGE=1
 
 install:
   - python setup.py develop
 
 script:
   - set -e
-  - pytest randomstate
+  - pytest --cov-config .coveragerc --cov=randomstate randomstate --cov-report xml --cov-report term
   - |
     if [ ${PYTHON} = 3.5 ]; then
       conda install -c conda-forge doctr
@@ -67,3 +69,6 @@ script:
       cd ${BUILD_DIR}/randomstate
       python performance.py;
     fi
+
+after_success:
+  codecov

randomstate/.coveragerc

@@ -1712,22 +1712,22 @@ def test_two_arg_funcs(self):
             out = func(self.argOne, argTwo[0])
             assert_equal(out.shape, self.tgtShape)
 
-        def test_randint(self):
-            itype = [np.bool, np.int8, np.uint8, np.int16, np.uint16,
-                     np.int32, np.uint32, np.int64, np.uint64]
-            func = mt19937.randint
-            high = np.array([1])
-            low = np.array([0])
-
-            for dt in itype:
-                out = func(low, high, dtype=dt)
-                assert_equal(out.shape, self.tgtShape)
-
-                out = func(low[0], high, dtype=dt)
-                assert_equal(out.shape, self.tgtShape)
-
-                out = func(low, high[0], dtype=dt)
-                assert_equal(out.shape, self.tgtShape)
+    def test_randint(self):
+        itype = [np.bool, np.int8, np.uint8, np.int16, np.uint16,
+                 np.int32, np.uint32, np.int64, np.uint64]
+        func = mt19937.randint
+        high = np.array([1])
+        low = np.array([0])
+
+        for dt in itype:
+            out = func(low, high, dtype=dt)
+            assert_equal(out.shape, self.tgtShape)
+
+            out = func(low[0], high, dtype=dt)
+            assert_equal(out.shape, self.tgtShape)
+
+            out = func(low, high[0], dtype=dt)
+            assert_equal(out.shape, self.tgtShape)
 
     def test_three_arg_funcs(self):
         funcs = [mt19937.noncentral_f, mt19937.triangular,

randomstate/tests/test_numpy_mt19937.py

@@ -14,6 +14,7 @@
 import versioneer
 
 DEVELOP = False
+CYTHON_COVERAGE = bool(os.environ.get('CYTHON_COVERAGE', False))
 
 try:
     import Cython.Tempita as tempita
@@ -37,6 +38,8 @@
 compile_rngs = rngs[:]
 
 extra_defs = [('_CRT_SECURE_NO_WARNINGS', '1')] if os.name == 'nt' else []
+extra_defs += [('CYTHON_TRACE_NOGIL','1')] if CYTHON_COVERAGE else []
+
 extra_link_args = ['/LTCG', '/OPT:REF', 'Advapi32.lib', 'Kernel32.lib'] if os.name == 'nt' else []
 # TODO: The unddefine is to handle a problem when building
 # TODO: manylinux1 on CentOS 5/GCC 4.8.2
@@ -242,7 +245,9 @@ def cythonize(e, *args, **kwargs):
         with open(output_file_name, 'w') as output_file:
             output_file.write(template.substitute())
 
-ext_modules = cythonize(extensions, force=not DEVELOP, annotate=True)
+directives = {'linetrace': CYTHON_COVERAGE}
+ext_modules = cythonize(extensions, force=not DEVELOP, annotate=True,
+                        compiler_directives=directives)
 
 classifiers = ['Development Status :: 5 - Production/Stable',
                'Environment :: Console',