Skip to content

Commit 8360ec5

Browse files
committed
Update docs workflow and build artifacts
1 parent 17214bb commit 8360ec5

10 files changed

Lines changed: 775 additions & 833 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version.py
44
# Sphinx automatic generation of API
55
docs/README.md
66
docs/_api/
7+
docs/_generated/
78

89
# Combined environments
910
ci/combined-environment-*.yml

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
PROJECT := openptv_python
22
CONDA := conda
33
CONDAFLAGS :=
4+
UV := uv
5+
UVFLAGS := --extra dev --upgrade
46
COV_REPORT := html
57
PYTHON ?= python
68

@@ -15,11 +17,16 @@ unit-tests:
1517
type-check:
1618
$(PYTHON) -m mypy .
1719

20+
env-update: uv-env-update
21+
1822
conda-env-update:
1923
$(CONDA) install -y -c conda-forge conda-merge
2024
$(CONDA) run conda-merge environment.yml ci/environment-ci.yml > ci/combined-environment-ci.yml
2125
$(CONDA) env update $(CONDAFLAGS) -f ci/combined-environment-ci.yml
2226

27+
uv-env-update:
28+
$(UV) sync $(UVFLAGS)
29+
2330
docker-build:
2431
docker build -t $(PROJECT) .
2532

@@ -30,6 +37,6 @@ template-update:
3037
pre-commit run --all-files cruft -c .pre-commit-config-cruft.yaml
3138

3239
docs-build:
33-
cp README.md docs/. && cd docs && rm -fr _api && make clean && make html
40+
cp README.md docs/. && $(PYTHON) docs/render_native_stress_demo_include.py && cd docs && rm -fr _api && make clean && make html
3441

3542
# DO NOT EDIT ABOVE THIS LINE, ADD COMMANDS BELOW

README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,28 @@ OPENPTV_SKIP_STRESS_BENCHMARKS=1 uv run make
184184

185185
### Workflow for developers/contributors
186186

187-
For the best experience create a new conda environment (e.g. DEVELOP) with Python 3.12:
187+
Recommended contributor workflow with `uv`:
188188

189+
```bash
190+
uv venv
191+
source .venv/bin/activate
192+
make env-update
189193
```
194+
195+
This keeps the local environment synced to the locked developer dependency set.
196+
197+
If you prefer the conda workflow instead:
198+
199+
```bash
190200
conda create -n openptv-python -c conda-forge python=3.12
191201
conda activate openptv-python
202+
make conda-env-update
192203
```
193204

194205
Before pushing to GitHub, use the developer install above and then run the
195206
following commands:
196207

197-
1. Update conda environment: `make conda-env-update` or `uv venv` and `source .venv/bin/activate` followed by `uv sync --extra dev --upgrade`
208+
1. Update the environment: `make env-update` by default, or `make conda-env-update` if you are using the conda workflow
198209
1. If you are using pip instead of uv, install the editable developer environment: `pip install -e ".[dev]"`
199210
1. Sync with the latest [template](https://github.com/ecmwf-projects/cookiecutter-conda-package) (optional): `make template-update`
200211
1. Run quality assurance checks: `make qa`

docs/_static/native-backend-rollout-status.svg

Lines changed: 0 additions & 43 deletions
This file was deleted.

docs/_static/native-backend-unification.svg

Lines changed: 0 additions & 56 deletions
This file was deleted.

docs/_static/native-stress-demo.svg

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)