diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c17be8fe6e49db6f84c6386c27d07e39510fdbb..64ee07b1597ac8827d3a63cc0064fb227e3e6873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ build_and_deploy_docs: - apt install -y graphviz libgl1-mesa-glx xvfb xdg-utils - apt install -y libcairo2-dev libjpeg-dev libgif-dev script: - - pip install -r requirements_dev.txt + - pip install -r requirements_dev.txt -r requirements_continuous_integration.txt - python setup.py install - xvfb-run make docs - aws s3 cp ./docs/_build/html/ s3://${BUCKET_NAME} --recursive diff --git a/docs/Makefile b/docs/Makefile index e6adc31c0ab428f4605e2fd3335baea55119d668..eb44e95ecbb9bc4079613db7f5d1e95ed4359691 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,8 @@ # # You can set these variables from the command line. -SPHINXOPTS = +# TODO fix sphinx warnings instead of suppressing them... +SPHINXOPTS = -Q SPHINXBUILD = python -msphinx SPHINXPROJ = flatland SOURCEDIR = . diff --git a/make_docs.py b/make_docs.py index 8cc1124a6fe624fe5afff416450a0a5d30d654ca..5d27230fc82a5eb82550d5bef44a7f6f0942d368 100644 --- a/make_docs.py +++ b/make_docs.py @@ -24,7 +24,8 @@ subprocess.call(['sphinx-apidoc', '-o', 'docs/', 'flatland']) os.environ["SPHINXPROJ"] = "flatland" os.chdir('docs') subprocess.call(['python', '-msphinx', '-M', 'clean', '.', '_build']) -subprocess.call(['python', '-msphinx', '-M', 'html', '.', '_build']) -subprocess.call(['python', '-mpydeps', '../flatland', '-o', '_build/html/flatland.svg']) +# TODO fix sphinx warnings instead of suppressing them... +subprocess.call(['python', '-msphinx', '-M', 'html', '.', '_build', '-Q']) +subprocess.call(['python', '-mpydeps', '../flatland', '-o', '_build/html/flatland.svg', '--no-config', '--noshow']) browser('_build/html/index.html')