From d548a6bdc6a750d474ba40310e50430f79c296ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Tue, 19 Feb 2019 10:15:39 +0100 Subject: [PATCH] Use python packages from the package manager. --- .gitignore | 5 +---- Makefile | 20 +++++--------------- src/source/conf.py | 3 --- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index ce69cc11a..29647f53e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -*.zip -python/* src/build/* src/source/__pycache__/* -utils/__pycache__/* -src/source/_static/mathjax/* \ No newline at end of file +utils/__pycache__/* \ No newline at end of file diff --git a/Makefile b/Makefile index 63c783424..784ab724c 100644 --- a/Makefile +++ b/Makefile @@ -15,28 +15,18 @@ # You should have received a copy of the GNU General Public License # along with Dynare. If not, see . -MATHJAX_VERSION = 2.7.5 - SRC = $(wildcard src/source/*.rst) -.PHONY: all html pdf deps python mathjax +.PHONY: all html pdf all: html pdf -html: deps src/build/html/index.html +html: src/build/html/index.html src/build/html/index.html: $(SRC) src/source/conf.py - . python/bin/activate ; make -C src html + make -C src html -pdf: deps src/build/latex/dynare.pdf +pdf: src/build/latex/dynare.pdf src/build/latex/dynare.pdf: $(SRC) src/source/conf.py - . python/bin/activate ; make -C src latexpdf - -deps: python mathjax - -python: python/bin/python3 - -python/bin/python3: - python3 -m venv python - . python/bin/activate ; pip3 install --upgrade pip ; pip3 install sphinx recommonmark sphinx_rtd_theme + make -C src latexpdf diff --git a/src/source/conf.py b/src/source/conf.py index ccdce0115..d07a68944 100644 --- a/src/source/conf.py +++ b/src/source/conf.py @@ -66,9 +66,6 @@ html_theme_options = { 'logo': 'dlogo.svg', 'logo_name': False, 'fixed_sidebar': True, - 'sidebar_collapse': True, - 'show_relbar_top': True, - 'show_relbar_bottom': True, 'page_width': '100%', }