From 3329e0fef50738514382c86f03328450c6747798 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Thu, 21 Jul 2016 00:26:30 +0200 Subject: Fix NoneType error in docs script --- docs/source/generate_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/generate_commands.py b/docs/source/generate_commands.py index 3731c574..e31c130c 100755 --- a/docs/source/generate_commands.py +++ b/docs/source/generate_commands.py @@ -58,7 +58,7 @@ def rstify_parser(parser): if len(parser._positionals._group_actions) == 1: out += " argument\n" a = parser._positionals._group_actions[0] - out += ' '*8 + parser._positionals._group_actions[0].help + out += ' '*8 + str(parser._positionals._group_actions[0].help) if a.choices: out += ". valid choices are: %s." % ','.join(['\`%s\`' % s for s in a.choices]) -- cgit v1.2.3 From a5044680a6501de8fc60385c1f5c4e133449c407 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sat, 10 Dec 2016 13:07:12 +0100 Subject: Use some more variables in makefile On Arch Linux python points to python3 and hence the makefile fails. With this change users can tell the makefile which python executable to use: make PYTHON=/some/version2/python ... or simply make PYTHON=python2 ... For sake of completeness the same is done for rm. --- docs/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 95de3969..68f7e497 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -6,6 +6,7 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = BUILDDIR = build +PYTHON = python # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 @@ -43,13 +44,13 @@ help: @echo " doctest to run all doctests embedded in the documentation (if enabled)" $(COMMAND_OPTION_TABLES): ../alot/commands/__init__.py - python source/generate_commands.py + $(PYTHON) source/generate_commands.py $(CONFIG_OPTION_TABLES): ../alot/defaults/alot.rc.spec - python source/generate_configs.py + $(PYTHON) source/generate_configs.py clean: - -rm -rf $(BUILDDIR)/* + -$(RM) -rf $(BUILDDIR)/* html: $(CONFIG_OPTION_TABLES) $(COMMAND_OPTION_TABLES) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html -- cgit v1.2.3