From 213bdea0c577277ae592ea64d2e4f8caaae6587a Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@ess.eu>
Date: Wed, 19 Aug 2020 16:16:35 +0200
Subject: [PATCH] m2r -> m2r2
---
.gitlab-ci.yml | 5 +----
doc/conf.py | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b9552b..28b75c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,10 +36,7 @@ verify_tag:
pages:
stage: deploy
script:
- - apt update
- - apt install git -y
- - pip install sphinx sphinxcontrib-blockdiag blockdiag sphinxcontrib-restbuilder sphinx_rtd_theme numpy
- - pip install git+https://github.com/crossnox/m2r
+ - pip install sphinx sphinxcontrib-blockdiag blockdiag sphinxcontrib-restbuilder sphinx_rtd_theme numpy m2r2
- python setup.py install
- sphinx-build -b html -d public/doctrees doc public
artifacts:
diff --git a/doc/conf.py b/doc/conf.py
index 7f95656..8eaa855 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -43,7 +43,7 @@ extensions = [
"sphinx.ext.ifconfig",
"sphinx.ext.viewcode",
"sphinxcontrib.restbuilder",
- "m2r",
+ "m2r2",
]
# set napoleon style docstring
--
GitLab