From 37212d2a9a8e216cfa7934cf33a12308f3ff521f Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sat, 28 Feb 2026 21:20:11 -0600 Subject: [PATCH] Fixes for deploy_docs --- .github/workflows/deploy_docs.yml | 13 +++++++------ docs/conf.py | 6 +++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 7bd9849c2..d6aa1fd04 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -15,24 +15,26 @@ jobs: docs: runs-on: ubuntu-latest name: "docs" + env: + CONDA_PY: "3.12" steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true - python-version: "3.11" + python-version: "3.12" miniforge-version: latest - name: "Install requirements" run: source devtools/conda_install_reqs.sh - - name: "Install OPS" - run: | - python -m pip install --no-deps -e . - python -c "import openpathsampling" - name: "Install doc tools" run: | python -m pip install numpydoc s3cmd conda install -y -c conda-forge --file docs/requirements.txt + - name: "Install OPS" + run: | + python -m pip install --no-deps -e . + python -c "import openpathsampling" - name: "Versions" run: conda list - name: "Build docs" @@ -49,4 +51,3 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - diff --git a/docs/conf.py b/docs/conf.py index 9fb651f63..a0d22975c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,6 +20,11 @@ # we use these to get the version import packaging.version +# Ensure local source tree is imported before any installed package. +DOCS_DIR = os.path.abspath(os.path.dirname(__file__)) +REPO_ROOT = os.path.abspath(os.path.join(DOCS_DIR, "..")) +sys.path.insert(0, REPO_ROOT) + import openpathsampling import sphinx_rtd_theme @@ -40,7 +45,6 @@ def gen_cli_docs(config_file, stdout=False): # documentation root, use os.path.abspath to make it absolute, like shown here. #sys.path.insert(0, os.path.abspath('.')) -sys.path.insert(0,os.path.abspath('../openpathsampling/')) #sys.path.append(os.path.abspath('_themes')) # -- Preparing the CLI docs -----------------------------------------------