diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-19 11:34:06 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-19 11:34:06 +0200 |
| commit | 6128a88a6780af29825c73af0e32100e93c2f0b5 (patch) | |
| tree | 2cf28870f53ccec1b5093c7c2e8a461d08aef1dd | |
| parent | 0e620832b3b6d2e1027ead9730dce872983dd2ce (diff) | |
python code coverage on python circleci target. Fix language_level cython warning
| -rw-r--r-- | .circleci/config.yml | 10 | ||||
| -rw-r--r-- | src/python/setup.py.in | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index b04efd52..f8dae062 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,20 +57,22 @@ jobs: cmake -DUSER_VERSION_DIR=version ..; make user_version; cd version; - mkdir build; - cd build; - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 ..; + cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 .; cd python; python3 setup.py build_ext --inplace; make sphinx; cp -R sphinx /tmp/sphinx; python3 setup.py install; python3 setup.py clean --all; - ctest -j 2 --output-on-failure; + python3 -B -m pytest test/*.py --cov-report html --cov=gudhi; + cp -R htmlcov /tmp/htmlcov; - store_artifacts: path: /tmp/sphinx + - store_artifacts: + path: /tmp/htmlcov + doxygen: docker: - image: gudhi/ci_for_gudhi:latest diff --git a/src/python/setup.py.in b/src/python/setup.py.in index 98d058fc..3602fa42 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -32,7 +32,7 @@ runtime_library_dirs=[@GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS@] # Create ext_modules list from module list ext_modules = [] for module in cython_modules: - ext_modules.append(Extension( + extension = Extension( 'gudhi.' + module, sources = [source_dir + module + '.pyx',], language = 'c++', @@ -41,8 +41,8 @@ for module in cython_modules: libraries=libraries, library_dirs=library_dirs, include_dirs=include_dirs, - runtime_library_dirs=runtime_library_dirs, - cython_directives = {'language_level': str(sys.version_info[0])},)) + runtime_library_dirs=runtime_library_dirs,) + extension.cython_directives = {'language_level': str(sys.version_info[0])} ext_modules = cythonize(ext_modules) |