Skip to content

Commit 7ddbc5c

Browse files
authored
Merge pull request #34 from GavinHuttley/main
DEV: fix doc regressions and reinstate docbuild to release
2 parents 750ae50 + c74dc3a commit 7ddbc5c

2 files changed

Lines changed: 30 additions & 25 deletions

File tree

.github/workflows/release.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,28 @@ jobs:
4545
run: |
4646
uv run --group test nox -db uv --force-python python -s testmpi
4747
48-
# docbuild:
49-
# name: "Test the docs"
50-
# runs-on: ubuntu-latest
51-
# steps:
52-
# - uses: "actions/checkout@v6"
53-
# with:
54-
# fetch-depth: 0
55-
56-
# - uses: "actions/setup-python@v6"
57-
# with:
58-
# python-version: "3.14"
59-
60-
# - name: Install uv
61-
# uses: astral-sh/setup-uv@v7
62-
# with:
63-
# enable-cache: true
64-
# cache-dependency-glob: "pyproject.toml"
65-
66-
# - name: "test the docs code"
67-
# run: "uv run --group test zensical build"
48+
docbuild:
49+
name: "Test the docs"
50+
runs-on: ubuntu-latest
51+
steps:
52+
- uses: "actions/checkout@v6"
53+
with:
54+
fetch-depth: 0
55+
56+
- uses: "actions/setup-python@v6"
57+
with:
58+
python-version: "3.14"
59+
60+
- name: Install uv
61+
uses: astral-sh/setup-uv@v7
62+
with:
63+
enable-cache: true
64+
cache-dependency-glob: "pyproject.toml"
65+
66+
- name: "test the docs code"
67+
run: |
68+
uv run --group test nox -s cogdocs
69+
uv run --group test zensical build
6870
6971
build:
7072
name: Build wheel and sdist
@@ -99,8 +101,7 @@ jobs:
99101
100102
release_test:
101103
name: Release to Test PyPI
102-
needs: build
103-
# needs: [build, docbuild]
104+
needs: [build, docbuild]
104105
environment: release_test
105106
runs-on: ubuntu-latest
106107
permissions:

docs/howto/log-and-cite.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ We reproduce here one of the examples from [scitrack](https://github.com/Huttley
4242

4343
By default, `apply_to` creates a `CachingLogger` that records the composable function, package versions, output paths, MD5 checksums of every result, and total elapsed time. The log is then written into the output data store. This is the recommended setting for production analyses because it gives you a complete, self-contained record of what ran and what it produced.
4444

45-
```python
45+
```python { notest }
4646
result = process.apply_to(dstore) # logger=True by default
4747
```
4848

4949
You can also pass your own `CachingLogger` instance if you want to configure it beforehand or reuse one across multiple calls.
5050

51-
```python
51+
```python { notest }
5252
from scitrack import CachingLogger
5353

5454
LOGGER = CachingLogger()
@@ -60,7 +60,7 @@ result = process.apply_to(dstore, logger=LOGGER)
6060

6161
Set `logger=False` to skip logging entirely.
6262

63-
```python
63+
```python { notest }
6464
result = process.apply_to(dstore, logger=False)
6565
```
6666

@@ -130,11 +130,13 @@ exec_codeblock(src=src,
130130
version="0.1.0",
131131
)
132132

133+
133134
@define_app(cite=my_cite) # (1)!
134135
def strict_filter(val: AlignedSeqsType) -> AlignedSeqsType:
135136
"""Remove sequences shorter than the alignment."""
136137
return val.omit_bad_seqs()
137138

139+
138140
app = strict_filter()
139141

140142
loader = get_app("load_aligned", moltype="dna", format_name="fasta")
@@ -204,10 +206,12 @@ exec_codeblock(src=src, annotations=["Because we are using `cogent3`, the proper
204206
year=2025,
205207
)
206208

209+
207210
@define_app(cite=my_cite)
208211
def strict_filter(val: AlignedSeqsType) -> AlignedSeqsType:
209212
return val.omit_bad_seqs()
210213

214+
211215
in_dstore = open_data_store("data/raw.zip", suffix="fa", limit=5)
212216
out_dstore = open_data_store("cited_results", suffix="fa", mode="w")
213217

0 commit comments

Comments
 (0)