diff --git a/documentation/conf.py b/documentation/conf.py index 8fbbd100af..9ceb0317c1 100644 --- a/documentation/conf.py +++ b/documentation/conf.py @@ -126,26 +126,7 @@ def install_doxygen(): # Install AMICI if not already present typing.TYPE_CHECKING = True - -try: - import amici -except ModuleNotFoundError: - subprocess.run([ - 'python', '-m', 'pip', 'install', '--verbose', '-e', - os.path.join(amici_dir, 'python', 'sdist') - ], check=True) - - from importlib import invalidate_caches - - invalidate_caches() - - sys.path.insert(0, amici_dir) - sys.path.insert(0, os.path.join(amici_dir, 'python', 'sdist')) - - import amici -# Works around some cyclic dependency issue with amici.petab_import_pysb -import amici.petab_import - +import amici typing.TYPE_CHECKING = False diff --git a/documentation/rtd_requirements.txt b/documentation/rtd_requirements.txt index 37d6f7663c..dc598deaa0 100644 --- a/documentation/rtd_requirements.txt +++ b/documentation/rtd_requirements.txt @@ -1,3 +1,4 @@ +# NOTE: relative paths are expected to be relative to the repository root sphinx==5.1.1 mock>=4.0.3 setuptools==65.5.1 @@ -20,3 +21,4 @@ sphinxcontrib-napoleon>=0.7 pygments==2.13.0 Jinja2==3.1.2 git+https://github.com/readthedocs/readthedocs-sphinx-ext +-e python/sdist/ diff --git a/scripts/run-sphinx.sh b/scripts/run-sphinx.sh index 933b8dc9cf..04716d4b7b 100755 --- a/scripts/run-sphinx.sh +++ b/scripts/run-sphinx.sh @@ -7,8 +7,8 @@ AMICI_PATH=$(cd $SCRIPT_PATH/.. && pwd) python3 -m venv ${AMICI_PATH}/doc-venv --clear source ${AMICI_PATH}/doc-venv/bin/activate python -m pip install --upgrade --no-cache-dir pip -python -m pip install --exists-action=w --no-cache-dir -r ${AMICI_PATH}/documentation/rtd_requirements.txt -python -m pip install --exists-action=w --no-cache-dir -r ${AMICI_PATH}/documentation/rtd_requirements2.txt +(cd ${AMICI_PATH}/ && python -m pip install --exists-action=w --no-cache-dir -r documentation/rtd_requirements.txt) +(cd ${AMICI_PATH}/ && python -m pip install --exists-action=w --no-cache-dir -r documentation/rtd_requirements2.txt) ${AMICI_PATH}/scripts/run-sphinx-hasenv.sh