From 68262285e53082f6c3c2a85aee3db9e7ed583d61 Mon Sep 17 00:00:00 2001 From: Jerome Kelleher Date: Fri, 27 Feb 2026 14:40:27 +0000 Subject: [PATCH 1/3] Standardise docs build: use __PKG_VERSION__, uv-based build.sh, minimal Makefile --- docs/Makefile | 15 ++------------- docs/_config.yml | 2 +- docs/build.sh | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 564016441..9b51871bf 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,16 +1,5 @@ - -# Need to set PYTHONPATH so that we pick up the local msprime -PYPATH=${PWD}/.. -MSP_VERSION:=$(shell PYTHONPATH=${PYPATH} \ - python3 -c 'import msprime; print(msprime.__version__.split("+")[0])') - -dev: - PYTHONPATH=${PYPATH} ./build.sh - -dist: - @echo Building distribution for msprime version ${MSP_VERSION} - sed -i s/__MSPRIME_VERSION__/${MSP_VERSION}/g _config.yml - PYTHONPATH=${PYPATH} ./build.sh +all: + ./build.sh clean: rm -fR _build diff --git a/docs/_config.yml b/docs/_config.yml index 917c281c4..12a70715f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -42,7 +42,7 @@ sphinx: navigation_with_keys: false pygments_dark_style: monokai logo: - text: "Version __MSPRIME_VERSION__" + text: "Version __PKG_VERSION__" myst_enable_extensions: - colon_fence - deflist diff --git a/docs/build.sh b/docs/build.sh index e365f53ea..50afe9f2f 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -6,7 +6,7 @@ REPORTDIR=_build/html/reports -jupyter-book build -nW --keep-going . +uv run --project=.. --only-group docs jupyter-book build . -vnW --keep-going RETVAL=$? if [ $RETVAL -ne 0 ]; then if [ -e $REPORTDIR ]; then From 30f9e543d44674d243d0dacf6046bdd63371fd29 Mon Sep 17 00:00:00 2001 From: Jerome Kelleher Date: Fri, 27 Feb 2026 14:43:32 +0000 Subject: [PATCH 2/3] Update min_python_version to 3.11 --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 12a70715f..bf48f4eec 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -70,4 +70,4 @@ sphinx: autodoc_typehints: none myst_substitutions: - min_python_version: "3.10" + min_python_version: "3.11" From 14fd1246383666923606345189f4cb19da15b537 Mon Sep 17 00:00:00 2001 From: Jerome Kelleher Date: Fri, 27 Feb 2026 15:09:12 +0000 Subject: [PATCH 3/3] Use --group instead of --only-group in build.sh --- docs/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build.sh b/docs/build.sh index 50afe9f2f..0883ba59d 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -6,7 +6,7 @@ REPORTDIR=_build/html/reports -uv run --project=.. --only-group docs jupyter-book build . -vnW --keep-going +uv run --project=.. --group docs jupyter-book build . -vnW --keep-going RETVAL=$? if [ $RETVAL -ne 0 ]; then if [ -e $REPORTDIR ]; then