From 1d248eb93ed965f512ae08981b7c1105d82ffe16 Mon Sep 17 00:00:00 2001
From: Ben Jeffery <ben.jeffery@bdi.ox.ac.uk>
Date: Mon, 16 Dec 2024 12:46:56 +0000
Subject: [PATCH] Fix docs

---
 .github/workflows/docs.yml                | 38 +++++++++--------------
 .github/workflows/tests.yml               |  2 +-
 requirements/CI-docs-pip/requirements.txt |  1 +
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index b626fb1..900f4bc 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,13 +7,6 @@ on:
     tags:
       - '*'
 
-env:
-  COMMIT_EMAIL: ben.jeffery.well+adminbot@gmail.com
-  MAKE_TARGET: -C python
-  OWNER: tskit-dev
-  REPO: tskit
-  REQUIREMENTS: python/requirements/CI-docs/requirements.txt
-
 jobs:
   build-deploy-docs:
     name: Docs
@@ -29,26 +22,23 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Setup Conda
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          miniforge-version: latest
-          activate-environment: tskit-docs-env
-          
-      - name: Cache Conda env
-        uses: actions/cache@v4
+      - uses: actions/setup-python@v5.3.0
         with:
-          path: ${{ env.CONDA }}/envs
-          key: conda-${{ runner.os }}--${{ runner.arch }}--${{ hashFiles(env.REQUIREMENTS) }}-${{ env.CACHE_NUMBER }}
-        env:
-          CACHE_NUMBER: 0
-        id: cache
+          python-version: "3.11"
+          cache: "pip"
 
-      - name: Update environment
+      - name: Create venv and install deps (one by one to avoid conflict errors)
         run: |
-          mamba install -y python=3.12 doxygen pip
-          pip install -r ${{ env.REQUIREMENTS }}
-        if: steps.cache.outputs.cache-hit != 'true'
+          pip install --upgrade pip wheel
+          pip install -r requirements/CI-docs-pip/requirements.txt
 
       - name: Build Docs
         run: make -C docs
+
+      - name: Trigger docs site rebuild
+        if: github.ref == 'refs/heads/main'
+        run: |
+          curl -X POST https://api.github.com/repos/tskit-dev/tskit-site/dispatches \
+                    -H 'Accept: application/vnd.github.everest-preview+json' \
+                    -u AdminBot-tskit:${{ secrets.ADMINBOT_TOKEN }} \
+                    --data '{"event_type":"build-docs"}'
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 992d971..8f736f8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: [ 3.9, 3.12 ]
+        python: [ 3.10, 3.12 ]
         os:  [ macos-latest, ubuntu-24.04, windows-latest ]
     defaults:
       run:
diff --git a/requirements/CI-docs-pip/requirements.txt b/requirements/CI-docs-pip/requirements.txt
index e8b5efd..639199c 100644
--- a/requirements/CI-docs-pip/requirements.txt
+++ b/requirements/CI-docs-pip/requirements.txt
@@ -5,6 +5,7 @@ sphinx-issues==4.1.0
 sphinx-argparse==0.4.0
 svgwrite==1.4.3
 tskit==0.6.0
+tsinfer==0.3.3
 scipy==1.14.1
 msprime==1.3.2
 sphinx-book-theme