From 8f16984a003544b5e5bd5923a05e7e8cc8f38b50 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:30:54 -0600 Subject: [PATCH 01/12] Add Gitlab examples CI --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04d8449..03d20cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,21 @@ Python 3: reports: junit: test/pytest.xml +Examples: + script: | + sudo apt update + sudo apt install libsilo-dev + ./configure.py --use-silo + EXTRA_INSTALL="numpy pybind11" + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_venv + run_examples + tags: + - docker-runner + except: + - tags + Documentation: script: | EXTRA_INSTALL="numpy" -- GitLab From c1b09c792bba35a4ba1b17bbf28d0a20fa841250 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:31:09 -0600 Subject: [PATCH 02/12] Remove extraneous 'py_version=3' from Gitlab CI config --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03d20cc..7a4b167 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,6 @@ Python 3: script: | sudo apt update sudo apt install libsilo-dev - py_version=3 ./configure.py --use-silo EXTRA_INSTALL="numpy pybind11" curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh -- GitLab From 37b9889521d56d99054651b62baba4c50b5fab0b Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:31:41 -0600 Subject: [PATCH 03/12] Fix doc build warnings, enable Doc CI check in Gitlab CI --- .gitlab-ci.yml | 2 +- doc/index.rst | 24 +++++++++++---------- doc/vtk.rst | 4 ++-- examples/vtk-unstructured-points.py | 33 +++++++++++++++++++++++++++++ pyvisfile/vtk/__init__.py | 8 +++---- 5 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 examples/vtk-unstructured-points.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a4b167..b70c944 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ Documentation: curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh build_py_project_in_venv - build_docs --no-check + build_docs maybe_upload_docs tags: - python3 diff --git a/doc/index.rst b/doc/index.rst index cfe4e31..112929a 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -4,15 +4,15 @@ Welcome to :mod:`pyvisfile`'s documentation! Pyvisfile allows you to write a variety of visualization file formats, including -* `Kitware's `_ - `XML-style `_ - `Vtk `_ data files. +* `Kitware's `__ + `XML-style `__ + `Vtk `__ data files. * Silo visualization files, as introduced by LLNL's - `MeshTV `_ and + `MeshTV `__ and more recently used by the - `VisIt `_ + `VisIt `__ large-scale visualization program. pyvisfiles supports many mesh geometries, such such as unstructured @@ -24,14 +24,16 @@ supports the writing of expressions as visualization variables. pyvisfile can write Vtk files without any extra software installed. -PyVisfile allows you to write `Silo `_ -and `Vtk `_ (`XML-style `_) -visualization files from the `Python `_ -programming language, more specifically from data contained in `numpy -`_ arrays. +PyVisfile allows you to write `Silo `__ +and `Vtk `_ (`XML-style `__) +visualization files from the `Python `__ +programming language, more specifically from data contained in :mod:`numpy` +arrays. For updates, downloads and support, please visit the `PyVisfile web page -`_. +`__. + +.. module:: pyvisfile Table of Contents ----------------- diff --git a/doc/vtk.rst b/doc/vtk.rst index e331c8d..f5be28e 100644 --- a/doc/vtk.rst +++ b/doc/vtk.rst @@ -11,10 +11,10 @@ Examples Writing a structured mesh ^^^^^^^^^^^^^^^^^^^^^^^^^ -.. literalinclude:: ../examples/vtk-structured.py +.. literalinclude:: ../examples/vtk-structured-2d-plain.py (You can find this example as -:download:`examples/vtk-structured.py <../examples/vtk-structured.py>` in the PyVisfile +:download:`examples/vtk-structured-2d-plain.py <../examples/vtk-structured-2d-plain.py>` in the PyVisfile source distribution.) Writing an unstructured mesh diff --git a/examples/vtk-unstructured-points.py b/examples/vtk-unstructured-points.py new file mode 100644 index 0000000..bba2aa3 --- /dev/null +++ b/examples/vtk-unstructured-points.py @@ -0,0 +1,33 @@ +import numpy as np +from pyvisfile.vtk import ( + UnstructuredGrid, DataArray, + AppendedDataXMLGenerator, + VTK_VERTEX, VF_LIST_OF_VECTORS, VF_LIST_OF_COMPONENTS) + +n = 5000 +points = np.random.randn(n, 3) + +data = [ + ("p", np.random.randn(n)), + ("vel", np.random.randn(3, n)), +] +file_name = "points.vtu" +compressor = None + +grid = UnstructuredGrid( + (n, DataArray("points", points, vector_format=VF_LIST_OF_VECTORS)), + cells=np.arange(n, dtype=np.uint32), + cell_types=np.asarray([VTK_VERTEX] * n, dtype=np.uint8)) + +for name, field in data: + grid.add_pointdata(DataArray(name, field, + vector_format=VF_LIST_OF_COMPONENTS)) + +from os.path import exists +if exists(file_name): + raise RuntimeError("output file '%s' already exists" + % file_name) + +outf = open(file_name, "w") +AppendedDataXMLGenerator(compressor)(grid).write(outf) +outf.close() diff --git a/pyvisfile/vtk/__init__.py b/pyvisfile/vtk/__init__.py index a398099..362b81a 100644 --- a/pyvisfile/vtk/__init__.py +++ b/pyvisfile/vtk/__init__.py @@ -578,14 +578,14 @@ class XMLGenerator: * ``"0.1"`` is the original version. * ``"1.0"`` added support for 64-bit indices and offsets, as - described `here `_. + described `here `__. * ``"2.0"`` added support for ghost array data, as - described `here `_. + described `here `__. * ``"2.1"``: added support for writing additional information attached to a :class:`DataArray` using - `information keys `_. + `information keys `__. * ``"2.2"``: changed the node numbering of the hexahedron, as - described `here `_. + described `here `__. """ # noqa if compressor == "zlib": -- GitLab From 90b6e2013a65342947d555f936a75a92938ea673 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:38:05 -0600 Subject: [PATCH 04/12] Github CI: Test on 3.6 and 3.x --- .ci/install-silo-on-github.sh | 8 ++++++++ .github/workflows/ci.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 .ci/install-silo-on-github.sh diff --git a/.ci/install-silo-on-github.sh b/.ci/install-silo-on-github.sh new file mode 100755 index 0000000..3e9ca39 --- /dev/null +++ b/.ci/install-silo-on-github.sh @@ -0,0 +1,8 @@ +#! /bin/bash +sudo apt update +sudo apt install libsilo-dev + +curl -L -O https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2-bsd-smalltest.tar.gz +tar xfz silo-4.10.2-bsd-smalltest.tar.gz +sudo cp silo-4.10.2-bsd/src/silo/silo_exports.h /usr/include +sudo chmod a+rX /usr/include/silo_exports.h diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56646c5..e8ffe6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: [3.6, 3.x] steps: - uses: actions/checkout@v2 - -- GitLab From 7cbbbee94e24aa36a8b1edc645061069e30498fb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:38:23 -0600 Subject: [PATCH 05/12] Add examples and doc Github CI --- .github/workflows/ci.yml | 54 ++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8ffe6d..65c71db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,15 +36,53 @@ jobs: python-version: ${{ matrix.python-version }} - name: "Main Script" run: | - sudo apt update - sudo apt install libsilo-dev + ./.ci/install-silo-on-github.sh + EXTRA_INSTALL="numpy pybind11" + ./configure.py --use-silo + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_venv + test_py_project - curl -L -O https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2-bsd-smalltest.tar.gz - tar xfz silo-4.10.2-bsd-smalltest.tar.gz - sudo cp silo-4.10.2-bsd/src/silo/silo_exports.h /usr/include - sudo chmod a+rX /usr/include/silo_exports.h + examples: + name: Examples on Py${{ matrix.python-version }} + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.6, 3.x] + steps: + - uses: actions/checkout@v2 + - + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: "Main Script" + run: | + ./.ci/install-silo-on-github.sh + EXTRA_INSTALL="numpy pybind11" + ./configure.py --use-silo + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_venv + run_examples + docs: + name: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - + uses: actions/setup-python@v1 + with: + python-version: '3.x' + - name: "Main Script" + run: | + ./.ci/install-silo-on-github.sh EXTRA_INSTALL="numpy pybind11" ./configure.py --use-silo - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - . ./build-and-test-py-project.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_venv + build_docs + +# vim: sw=4 -- GitLab From 9d68e55fc048c4a5404974b60cc30a3f060ca5bc Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:48:09 -0600 Subject: [PATCH 06/12] Fix some doc build errors --- doc/installing.rst | 24 ++++++------------------ pyvisfile/silo/__init__.py | 14 ++++++-------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/doc/installing.rst b/doc/installing.rst index 81af007..ae6f701 100644 --- a/doc/installing.rst +++ b/doc/installing.rst @@ -22,7 +22,7 @@ To follow, you need basic things: You may adapt the file and directory names in this tutorial to suit your liking, just be sure to be consistent in your changes. -.. note:: +.. note:: Whenever you see the "`$`" dollar sign in this tutorial, this means you should enter the subsequent text at your shell prompt. @@ -33,19 +33,7 @@ your liking, just be sure to be consistent in your changes. With Silo capability -------------------- -Step 1: Install :mod:`pyublas` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. note:: - - If you have already installed :mod:`hedge`, then you automatically - also already have :mod:`pyublas`, and you can skip this step. - -The first step in this installation is to install PyUblas. To achieve -this, please follow `PyUblas's installation instructions -`_. - -Step 2: Download and build libsilo +Step 1: Download and build libsilo ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Download the `Silo source code @@ -57,22 +45,22 @@ newer. Then unpack, build and install it:: $ ./configure --prefix=$HOME/pool --enable-shared=yes --enable-static=no $ make install -Step 3: Update your build configuration file +Step 2: Update your build configuration file ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ During prior steps of this installation, you will have created -a file called :file:`.aksetup-defaults.py` in your home directory. +a file called :file:`.aksetup-defaults.py` in your home directory. Now add the following lines to this file:: SILO_INC_DIR = ['${HOME}/pool/include'] SILO_LIB_DIR = ['${HOME}/pool/lib'] -You will need to adapt the above path names to the location where you installed +You will need to adapt the above path names to the location where you installed the Silo software, of course. .. note:: - Make sure not to miss the initial dot in the configuration file name, + Make sure not to miss the initial dot in the configuration file name, it's important. .. note:: diff --git a/pyvisfile/silo/__init__.py b/pyvisfile/silo/__init__.py index 33ed991..fe6d899 100644 --- a/pyvisfile/silo/__init__.py +++ b/pyvisfile/silo/__init__.py @@ -217,11 +217,9 @@ class SiloFile(_silo.DBFile): """Add an defined variable ("expression") to this database. The *vars* argument consists of a list of tuples of type - *(name, definition)* - or - *(name, definition, DB_VARTYPE_SCALAR | DB_VARTYPE_VECTOR)* - or even - *(name, definition, DB_VARTYPE_XXX, {options})*. + ``(name, definition)`` or + ``(name, definition, DB_VARTYPE_SCALAR | DB_VARTYPE_VECTOR)`` or even + ``(name, definition, DB_VARTYPE_XXX, {options})`` If the type is not specified, scalar is assumed. """ @@ -340,11 +338,11 @@ class ParallelSiloFile: """Add an defined variable ("expression") to this database. The *vars* argument consists of a list of tuples of type - *(name, definition)* + ``(name, definition)`` or - *(name, definition, DB_VARTYPE_SCALAR | DB_VARTYPE_VECTOR)*. + ``(name, definition, DB_VARTYPE_SCALAR | DB_VARTYPE_VECTOR)``. or even - *(name, definition, DB_VARTYPE_XXX, {options})*. + ``(name, definition, DB_VARTYPE_XXX, {options})``. If the type is not specified, scalar is assumed. """ if self.master_file is not None: -- GitLab From 86396a154c701160c1a6b45a3f6003e27c261863 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:48:22 -0600 Subject: [PATCH 07/12] Replace doc Makefile with more minimal one (stolen/preempted from gh-12) --- doc/Makefile | 80 ++++++++-------------------------------------- doc/upload-docs.sh | 2 +- 2 files changed, 15 insertions(+), 67 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index f5d69bb..fc8f3d1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,72 +1,20 @@ -# Makefile for Sphinx documentation +# Minimal makefile for Sphinx documentation # -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d .build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html web htmlhelp latex changes linkcheck +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = "." +BUILDDIR = _build +# Put it first so that "make" without argument is like "make help". help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " web to make files usable by Sphinx.web" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " changes to make an overview over all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - -clean: - -rm -rf .build/* - -html: - mkdir -p .build/html .build/doctrees - mkdir -p .static .templates - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) .build/html - @echo - @echo "Build finished. The HTML pages are in .build/html." - -web: - mkdir -p .build/web .build/doctrees - mkdir -p .static .templates - $(SPHINXBUILD) -b web $(ALLSPHINXOPTS) .build/web - @echo - @echo "Build finished; now you can run" - @echo " python -m sphinx.web .build/web" - @echo "to start the server." - -htmlhelp: - mkdir -p .build/htmlhelp .build/doctrees - mkdir -p .static .templates - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) .build/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in .build/htmlhelp." - -latex: - mkdir -p .build/latex .build/doctrees - mkdir -p .static .templates - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) .build/latex - @echo - @echo "Build finished; the LaTeX files are in .build/latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -changes: - mkdir -p .build/changes .build/doctrees - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) .build/changes - @echo - @echo "The overview file is in .build/changes." +.PHONY: help Makefile -linkcheck: - mkdir -p .build/linkcheck .build/doctrees - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) .build/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in .build/linkcheck/output.txt." +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/doc/upload-docs.sh b/doc/upload-docs.sh index 12132a0..ac08247 100755 --- a/doc/upload-docs.sh +++ b/doc/upload-docs.sh @@ -1,3 +1,3 @@ #! /bin/sh -rsync --verbose --archive --delete .build/html/* doc-upload:doc/pyvisfile +rsync --verbose --archive --delete _build/html/* doc-upload:doc/pyvisfile -- GitLab From 01b1f893f2642707df6111efaab846479fe822bb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:49:25 -0600 Subject: [PATCH 08/12] Gitignore doc build --- doc/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/.gitignore b/doc/.gitignore index 24e5b0a..e35d885 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1 +1 @@ -.build +_build -- GitLab From d4d4938207dae69a532a6e7b271451d28c0072c0 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:53:03 -0600 Subject: [PATCH 09/12] Avoid trying to run the vtk node order example --- .github/workflows/ci.yml | 9 ++++++--- .gitlab-ci.yml | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65c71db..a5cb6c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,9 @@ jobs: run: | ./.ci/install-silo-on-github.sh EXTRA_INSTALL="numpy pybind11" - ./configure.py --use-silo curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh + ./configure.py --use-silo build_py_project_in_venv test_py_project @@ -58,11 +58,14 @@ jobs: python-version: ${{ matrix.python-version }} - name: "Main Script" run: | + # not expected to run without matplotlib and vtk + rm examples/vtk-sample-elements.py + ./.ci/install-silo-on-github.sh EXTRA_INSTALL="numpy pybind11" - ./configure.py --use-silo curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh + ./configure.py --use-silo build_py_project_in_venv run_examples @@ -79,9 +82,9 @@ jobs: run: | ./.ci/install-silo-on-github.sh EXTRA_INSTALL="numpy pybind11" - ./configure.py --use-silo curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh + ./configure.py --use-silo build_py_project_in_venv build_docs diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b70c944..ad04d26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,10 @@ Examples: script: | sudo apt update sudo apt install libsilo-dev + + # not expected to run without matplotlib and vtk + rm examples/vtk-sample-elements.py + ./configure.py --use-silo EXTRA_INSTALL="numpy pybind11" curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh -- GitLab From 80a93c19ba5ab1e4b08dd3ead72e91c43890b1f6 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 3 Jan 2021 23:59:05 -0600 Subject: [PATCH 10/12] Run pytest on 3.7 and 3.x on Github CI --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5cb6c5..9b66028 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.x] + # For some reason, the Silo build doesn't succeed on 3.6? + python-version: [3.7, 3.x] steps: - uses: actions/checkout@v2 - -- GitLab From 59ede4e29f44e86ca1ad949ca4f15c1a861eab7f Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 4 Jan 2021 00:01:48 -0600 Subject: [PATCH 11/12] Install silo for doc build --- .gitlab-ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad04d26..c799993 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,10 +11,14 @@ Python 3: script: | sudo apt update sudo apt install libsilo-dev + + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh ./configure.py --use-silo + EXTRA_INSTALL="numpy pybind11" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - . ./build-and-test-py-project.sh + build_py_project_in_venv + test_py_project tags: - docker-runner except: @@ -31,10 +35,11 @@ Examples: # not expected to run without matplotlib and vtk rm examples/vtk-sample-elements.py - ./configure.py --use-silo - EXTRA_INSTALL="numpy pybind11" curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh + ./configure.py --use-silo + + EXTRA_INSTALL="numpy pybind11" build_py_project_in_venv run_examples tags: @@ -44,9 +49,14 @@ Examples: Documentation: script: | - EXTRA_INSTALL="numpy" + sudo apt update + sudo apt install libsilo-dev + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ./ci-support.sh + ./configure.py --use-silo + + EXTRA_INSTALL="numpy pybind11" build_py_project_in_venv build_docs maybe_upload_docs -- GitLab From 1cc9b3624980d265e2a89cde2819b35b366ad0f3 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 4 Jan 2021 00:04:03 -0600 Subject: [PATCH 12/12] Run doc build in Docker on Gitlab CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c799993..2f6db9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,4 +61,4 @@ Documentation: build_docs maybe_upload_docs tags: - - python3 + - docker-runner -- GitLab