From 15e0accb230b2f618e361b96e7f7b2c766179a68 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 10:15:04 +0100 Subject: Install version, clean compilation and test the installed version --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e45bc14..34910ad6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,7 @@ jobs: python: docker: - image: gudhi/ci_for_gudhi:latest + parallelism: 4 steps: - checkout - run: @@ -58,10 +59,12 @@ jobs: 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 ..; - make all; - ctest --output-on-failure; + python setup.py build_ext -j 4 --inplace; make sphinx; cp -R python/sphinx /tmp/sphinx; + python setup.py install; + python setup.py clean --all; + ctest -j 4 --output-on-failure; - store_artifacts: path: /tmp/sphinx -- cgit v1.2.3 From dc44366683dd87d362c82fe2d93cee8d52dc3f28 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 10:53:06 +0100 Subject: must change directory to build python --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34910ad6..4edb0e1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,7 @@ jobs: 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 ..; + cd python; python setup.py build_ext -j 4 --inplace; make sphinx; cp -R python/sphinx /tmp/sphinx; -- cgit v1.2.3 From 7833223f55ca261f4592efd7fbb1ae3002f40f3d Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 12:49:39 +0100 Subject: Try to use a specific version of docker file --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4edb0e1b..a166a439 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: python: docker: - - image: gudhi/ci_for_gudhi:latest + - image: gudhi/ci_for_gudhi@sha256:9c90c7965f2288470fd5b374200f5b1bc23a9bd9939ece9f1bf864a6135fccb5 parallelism: 4 steps: - checkout -- cgit v1.2.3 From b84ea8b77c759e8f8c84ca1b21f5eded3a975a50 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 13:06:10 +0100 Subject: Use python3 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a166a439..abcd52dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,11 +60,11 @@ jobs: cd build; cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 ..; cd python; - python setup.py build_ext -j 4 --inplace; + python3 setup.py build_ext -j 4 --inplace; make sphinx; cp -R python/sphinx /tmp/sphinx; - python setup.py install; - python setup.py clean --all; + python3 setup.py install; + python3 setup.py clean --all; ctest -j 4 --output-on-failure; - store_artifacts: -- cgit v1.2.3 From 9e955b7088ac19cf701b213337d8ea29355f0b40 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 13:11:31 +0100 Subject: Rollback latest docker tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index abcd52dd..d9678852 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: python: docker: - - image: gudhi/ci_for_gudhi@sha256:9c90c7965f2288470fd5b374200f5b1bc23a9bd9939ece9f1bf864a6135fccb5 + - image: gudhi/ci_for_gudhi:latest parallelism: 4 steps: - checkout -- cgit v1.2.3 From 31d3c96d65737fbeb0c8762b1f7e7ac4f5aaeab8 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 13:22:55 +0100 Subject: python change directory make copy fail --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d9678852..f4073746 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: cd python; python3 setup.py build_ext -j 4 --inplace; make sphinx; - cp -R python/sphinx /tmp/sphinx; + cp -R sphinx /tmp/sphinx; python3 setup.py install; python3 setup.py clean --all; ctest -j 4 --output-on-failure; -- cgit v1.2.3 From 2dbe066378ed3b5b4913775873326d0d62a7f1b9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 13:54:13 +0100 Subject: language_level was not properly set --- src/python/setup.py.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/setup.py.in b/src/python/setup.py.in index f993165c..c434f659 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -39,8 +39,7 @@ for module in 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,)) setup( name = 'gudhi', @@ -49,7 +48,8 @@ setup( author_email='gudhi-contact@lists.gforge.inria.fr', version='@GUDHI_VERSION@', url='http://gudhi.gforge.inria.fr/', - ext_modules = cythonize(ext_modules), + ext_modules = cythonize(ext_modules, + language_level=str(sys.version_info[0])), install_requires = ['cython','numpy >= 1.9',], setup_requires = ['numpy >= 1.9',], ) -- cgit v1.2.3 From 3f5420aa5d5c9de1cd0cfe6ea1eb57a20a212c7c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 6 Feb 2020 14:04:28 +0100 Subject: Rollback language_level --- src/python/setup.py.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/setup.py.in b/src/python/setup.py.in index c434f659..f993165c 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -39,7 +39,8 @@ for module in modules: libraries=libraries, library_dirs=library_dirs, include_dirs=include_dirs, - runtime_library_dirs=runtime_library_dirs,)) + runtime_library_dirs=runtime_library_dirs, + cython_directives = {'language_level': str(sys.version_info[0])},)) setup( name = 'gudhi', @@ -48,8 +49,7 @@ setup( author_email='gudhi-contact@lists.gforge.inria.fr', version='@GUDHI_VERSION@', url='http://gudhi.gforge.inria.fr/', - ext_modules = cythonize(ext_modules, - language_level=str(sys.version_info[0])), + ext_modules = cythonize(ext_modules), install_requires = ['cython','numpy >= 1.9',], setup_requires = ['numpy >= 1.9',], ) -- cgit v1.2.3