Remove unnecessary template and fix codecov options, I hope.

ionelmc · ionelmc · commit f37b054cf3cc · 2020-06-04T19:15:26.000+03:00
diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
diff --git a/setup.py b/setup.py
@@ -27,13 +27,6 @@ def read(*names, **kwargs):
         return fh.read()
 
 
-# Enable code coverage for C code: we can't use CFLAGS=-coverage in tox.ini, since that may mess with compiling
-# dependencies (e.g. numpy). Therefore we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after
-# deps have been safely installed).
-if 'TOXENV' in os.environ and 'SETUPPY_CFLAGS' in os.environ:
-    os.environ['CFLAGS'] = os.environ['SETUPPY_CFLAGS']
-
-
 class optional_build_ext(build_ext):
     """Allow the building of C extensions to fail."""
     def run(self):
@@ -124,7 +117,9 @@ def _unavailable(self, e):
         Extension(
             splitext(relpath(path, 'src').replace(os.sep, '.'))[0],
             sources=[path],
-            include_dirs=[dirname(path)]
+            extra_compile_args=os.environ.get('SETUPPY_CFLAGS', '').split(),
+            extra_link_args=os.environ.get('SETUPPY_LFLAGS', '').split(),
+            include_dirs=[dirname(path)],
         )
         for root, _, _ in os.walk('src')
         for path in glob(join(root, '*.c'))
diff --git a/tox.ini b/tox.ini
@@ -10,7 +10,6 @@ envlist =
 ignore_basepython_conflict = true
 
 [testenv]
-wheel = true
 basepython =
     pypy: {env:TOXPYTHON:pypy}
     pypy3: {env:TOXPYTHON:pypy3}
@@ -24,9 +23,16 @@ basepython =
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes
+    cover: SETUPPY_CFLAGS=-fprofile-arcs -ftest-coverage
+    cover: SETUPPY_LFLAGS=-lgcov
 passenv =
     *
-usedevelop = false
+usedevelop =
+    cover: true
+    nocov: false
+wheel =
+    cover: false
+    nocov: true
 deps =
     pytest
     pytest-benchmark
@@ -100,7 +106,8 @@ deps =
     codecov
 skip_install = true
 commands =
-    codecov []
+    codecov --gcov-root=. []
+
 
 [testenv:report]
 deps = coverage
@@ -113,45 +120,3 @@ commands =
 commands = coverage erase
 skip_install = true
 deps = coverage
-
-
-[testenv:py27-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:py35-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:py36-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:py37-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:py38-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:pypy-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
-
-
-[testenv:pypy3-cover]
-setenv =
-    SETUPPY_CFLAGS=-coverage
-usedevelop = true
