Skip to content
Snippets Groups Projects
Commit d77f7427 authored by Joseph Weston's avatar Joseph Weston Committed by Anton Akhmerov
Browse files

move documentation-building package installation to docker

parent f259d317
No related branches found
No related tags found
No related merge requests found
...@@ -239,9 +239,6 @@ build documentation: ...@@ -239,9 +239,6 @@ build documentation:
- build:latest - build:latest
stage: test stage: test
script: script:
- apt-get update && apt-get install -y librsvg2-bin # for converting svgs to pdfs
- pip install git+https://github.com/jupyter-widgets/jupyter-sphinx sphinxcontrib-svg2pdfconverter
- python -m ipykernel install --user --name kwant-latest
- make -C doc clean; make -C doc html SPHINXOPTS='-A website_deploy=True -n -W -D jupyter_execute_default_kernel=kwant-latest' SOURCE_LINK_TEMPLATE="$CI_PROJECT_URL"/blob/\$\$r/\$\$f - make -C doc clean; make -C doc html SPHINXOPTS='-A website_deploy=True -n -W -D jupyter_execute_default_kernel=kwant-latest' SOURCE_LINK_TEMPLATE="$CI_PROJECT_URL"/blob/\$\$r/\$\$f
artifacts: artifacts:
paths: paths:
...@@ -254,9 +251,6 @@ build PDF documentation: ...@@ -254,9 +251,6 @@ build PDF documentation:
- build:latest - build:latest
stage: test stage: test
script: script:
- apt-get update && apt-get install -y librsvg2-bin # for converting svgs to pdfs
- pip install git+https://github.com/jupyter-widgets/jupyter-sphinx sphinxcontrib-svg2pdfconverter
- python -m ipykernel install --user --name kwant-latest
- make -C doc latex SPHINXOPTS='-n -W -D jupyter_execute_default_kernel=kwant-latest' - make -C doc latex SPHINXOPTS='-n -W -D jupyter_execute_default_kernel=kwant-latest'
- cd doc/build/latex - cd doc/build/latex
- make all-pdf - make all-pdf
......
...@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ...@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# Additional tools for running CI # Additional tools for running CI
file rsync openssh-client \ file rsync openssh-client \
# Documentation building # Documentation building
inkscape texlive-full zip \ inkscape texlive-full zip librsvg2-bin \
&& apt-get clean && \ && apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
...@@ -18,3 +18,5 @@ COPY kwant-latest.yml kwant-stable.yml kwant-stable-no-extras.yml / ...@@ -18,3 +18,5 @@ COPY kwant-latest.yml kwant-stable.yml kwant-stable-no-extras.yml /
RUN conda env create -qf kwant-stable.yml RUN conda env create -qf kwant-stable.yml
RUN conda env create -qf kwant-stable-no-extras.yml RUN conda env create -qf kwant-stable-no-extras.yml
RUN conda env create -qf kwant-latest.yml RUN conda env create -qf kwant-latest.yml
RUN /usr/local/envs/kwant-latest/bin/python -m ipykernel install --user --name kwant-latest
...@@ -26,3 +26,6 @@ dependencies: ...@@ -26,3 +26,6 @@ dependencies:
- sphinx=1.7.4 # later versions seem to have problems - sphinx=1.7.4 # later versions seem to have problems
- numpydoc - numpydoc
- requests - requests
- pip:
- sphinxcontrib-svg2pdfconverter
- git+https://github.com/jupyter-widgets/jupyter-sphinx
...@@ -19,7 +19,3 @@ dependencies: ...@@ -19,7 +19,3 @@ dependencies:
- pytest-cov - pytest-cov
- pytest-flakes - pytest-flakes
- pytest-pep8 - pytest-pep8
# Documentation building
- sphinx=1.7.4 # later versions seem to have problems
- numpydoc
- requests
...@@ -22,7 +22,3 @@ dependencies: ...@@ -22,7 +22,3 @@ dependencies:
- pytest-cov - pytest-cov
- pytest-flakes - pytest-flakes
- pytest-pep8 - pytest-pep8
# Documentation building
- sphinx=1.7.4 # later versions seem to have problems
- numpydoc
- requests
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