From 6180e3a051ed4bb540b96642e835f8f0d4111a99 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 30 Oct 2020 10:49:58 -0700 Subject: [PATCH] doc: wikiparser: Fix issue with running parser outside doc/ dir Use a path relative to the script path when checking for existence of manual pages. Signed-off-by: Sunil Mohan Adapa --- .gitlab-ci.yml | 2 +- doc/scripts/wikiparser.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9eb1f1319..726057e3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ run-unit-tests: - su -c "cd ~/plinth; python3 -m flake8 --exclude actions/domainname-change,actions/dynamicdns,actions/hostname-change,actions/networks plinth actions/*" tester - su -c "cd ~/plinth;PYTHONPATH='.' py.test-3 --cov=plinth --cov-report=html:/home/tester/plinth/htmlcov --cov-report=term" tester - cp -r /home/tester/plinth/htmlcov test-coverage-report - - su -c "cd ~/plinth/doc;./scripts/wikiparser.py" tester + - su -c "doc/scripts/wikiparser.py" tester coverage: '/^TOTAL\s+.*\s+(\d+\.\d+%)$/' artifacts: diff --git a/doc/scripts/wikiparser.py b/doc/scripts/wikiparser.py index 0a7ef3073..a8026f09e 100755 --- a/doc/scripts/wikiparser.py +++ b/doc/scripts/wikiparser.py @@ -694,7 +694,8 @@ def resolve_url(url, context): link_language = DEFAULT_LANGUAGE # Check for local file and use local path - file_ = Path(f'manual/{link_language}') / (link_page + '.raw.wiki') + file_ = Path(__file__).parent.parent + file_ = file_ / f'manual/{link_language}' / (link_page + '.raw.wiki') if file_.exists(): help_base = LOCAL_BASE.format(lang=link_language) url = f'{help_base}{link_page}'