Mentions légales du service

Skip to content
Snippets Groups Projects
Commit c3243dec authored by PETIT Manuel's avatar PETIT Manuel
Browse files

Merge branch 'release/1.1.0' of https://gitlab.inria.fr/mosaic/bvpy into release/1.1.0

parents 5c447ac8 b106dd98
No related branches found
No related tags found
No related merge requests found
...@@ -95,7 +95,10 @@ pages: ...@@ -95,7 +95,10 @@ pages:
image: continuumio/miniconda3 image: continuumio/miniconda3
script: script:
# Install required 'libgl1' system dependency: # Install required 'libgl1' system dependency:
- apt-get update && apt-get install libgl1 -y - apt-get update && apt-get install libgl1 wget -y
# Download and install pandoc3.1.12.3 (version must be at least (2.14.2) but less than (4.0.0)):
- wget https://github.com/jgm/pandoc/releases/download/3.1.12.3/pandoc-3.1.12.3-1-amd64.deb
- dpkg -i pandoc-3.1.12.3-1-amd64.deb
# Install faster solver 'conda-libmamba-solver' & set it as default solver: # Install faster solver 'conda-libmamba-solver' & set it as default solver:
# - conda install -y -n base -c conda-forge conda-libmamba-solver # - conda install -y -n base -c conda-forge conda-libmamba-solver
# - conda config --set solver libmamba # - conda config --set solver libmamba
...@@ -105,7 +108,7 @@ pages: ...@@ -105,7 +108,7 @@ pages:
# Install `bvpy` package (from sources): # Install `bvpy` package (from sources):
- python -m pip install -e .[doc] - python -m pip install -e .[doc]
# Build the documentation with Sphinx: # Build the documentation with Sphinx:
- sphinx-build -b html doc/source/ public/ - sphinx-build -b html doc/ public/
retry: retry:
max: 2 max: 2
when: runner_system_failure when: runner_system_failure
......
...@@ -24,6 +24,7 @@ requirements: ...@@ -24,6 +24,7 @@ requirements:
run: run:
- python {{ python }} - python {{ python }}
- python-gmsh=4.11 - python-gmsh=4.11
- fenics=2019.1.0
{% for dep in deps %} {% for dep in deps %}
- {{ dep }} - {{ dep }}
{% endfor %} {% endfor %}
......
...@@ -34,7 +34,6 @@ doc = [ ...@@ -34,7 +34,6 @@ doc = [
"matplotlib", "matplotlib",
"sphinx", "sphinx",
"sphinx_rtd_theme", "sphinx_rtd_theme",
"pandoc",
"nbsphinx", "nbsphinx",
"notebook", "notebook",
"chardet", "chardet",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment