Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
54c202a
debug_util: Excess -v's should still show output
lentinj Jun 10, 2026
c664b8d
OTT_popularity_mapping: Add __repr__ to WikidataItem
lentinj Jun 10, 2026
1a18409
node_ages: download_node_ages pipeline stage
lentinj May 26, 2026
8a3e65f
requirements: Add requirements.txt to freeze git versions
lentinj Jun 8, 2026
fe6b473
date_tree: Copy main.py from dated-complete-tree
lentinj Jun 8, 2026
8072682
date_tree: Use date_cache directly, don't chronosynth it
lentinj Jun 8, 2026
e1b61df
download_node_ages: Move filtering from dated_complete_tree/tree_load…
lentinj Jun 8, 2026
09d59b8
download_opentree: Fetch files required by dated-complete-tree instead
lentinj Jun 8, 2026
3683803
date_tree: Exit early, write out tree
lentinj Jun 10, 2026
7083bda
tree_build: Replace get_open_trees_from_one_zoom / build_oz_tree
lentinj Jun 10, 2026
27030ab
taxon_map: Pull mapping from CSV_base_table_creator
lentinj Jun 10, 2026
d94bf3c
step_taxon: Apply taxon_map to built tree
lentinj Jun 11, 2026
fbfca90
step_popularity: Port popularity from CSV_base_table_creator
lentinj Jun 11, 2026
9b000e6
tree_build: Use ete4-default resolve_polytomy
lentinj Jun 11, 2026
314b540
step_tidy: Add tree tidying steps
lentinj Jun 11, 2026
cfbaaca
step_popularity: Add popularity_add_rank
lentinj Jun 11, 2026
dee1fe1
tree_build: Add ladderizing step
lentinj Jun 11, 2026
1b8e8a7
step_output: Add tree_build CSV-writing
lentinj Jun 11, 2026
775e144
tree_build/step_treeprop: date-derived tree properties #1007
lentinj May 29, 2026
7e9eb1d
tree_build/step_output: Assemble an ete4 tree property into 2 arrays
lentinj Jun 2, 2026
dcee836
step_output: Output dicts as JS source
lentinj Jun 12, 2026
f4f0b73
step_jsnewick: Convert tree JS output to ete4
lentinj Jun 12, 2026
123f4e4
step_tidy: Preseve date properties when we're removing
lentinj Jun 12, 2026
826916f
date_tree: Reconstitute date property
lentinj Jun 12, 2026
93327ce
tree_build: Output JS files
lentinj Jun 12, 2026
5a93185
step_treeprop: Avoid div/0 in weighted mean
lentinj Jun 12, 2026
12808c6
tree_build: Wire up prop arrays
lentinj Jun 12, 2026
fc4c4b0
tree_build: Bodge tree_dating into life
lentinj Jun 12, 2026
33e19cc
dvc.yaml: Manage tree_build output
lentinj Jun 12, 2026
ec960d7
versioned_outputs: Final copy-with-version-number/gzip stage
lentinj Jun 12, 2026
c09d720
dvc.yaml: Add back missing params
lentinj Aug 18, 2026
9eed26d
dvc.yaml: Refer to .venv paths for python executables
lentinj Aug 24, 2026
dfeb6b6
BespokeTree: Replace sharks with self-contained tree #130
lentinj Aug 25, 2026
0ec9404
AllLife/OpenTreeParts: Add copy of rotifers from previous tree #130
lentinj Aug 27, 2026
3a3591b
newick/format_newick: inline trim_tree
lentinj Aug 24, 2026
8c1278a
utilities/make_js_treefiles: Remove
lentinj Aug 24, 2026
1a2c528
tree_build/build_oz_tree: Remove
lentinj Aug 24, 2026
f1a443b
tree_build/get_open_trees_from_one_zoom: Remove
lentinj Aug 24, 2026
9d1bdfa
tree_build/oz_tokens: Remove
lentinj Aug 24, 2026
e66b8c3
tree_build: Wire up exclude_taxa
lentinj Aug 25, 2026
5cabe5f
taxon_map: Support --extra_source_file
lentinj Aug 25, 2026
9ebf4c2
taxon_map: Preserve structures when updating src
lentinj Aug 25, 2026
a2c7d36
taxon_mapping_and_popularity: Remove NCBI_via_silva hack
lentinj Aug 25, 2026
d3d2d22
taxon_map: Add source whitelist
lentinj Aug 25, 2026
f350530
taxon_map: ifung -> if as far as we can
lentinj Aug 25, 2026
e7819ab
CSV_base_table_creator: Remove
lentinj Aug 25, 2026
c600c24
date_tree: Don't clobber tree_build's log settings
lentinj Aug 27, 2026
f383150
debug_util: Force logging settings
lentinj Aug 27, 2026
b78fa2b
dvc.lock: Manually fix .venv/bin/ additions
lentinj Aug 28, 2026
a0a1359
step_treeprop: Read the "date" prop, not the unset "age"
lentinj Aug 28, 2026
88e4bce
tree_build: Anchor the root date at LUCA, without clobbering
lentinj Aug 28, 2026
bf839d3
tree_build: Identify polytomies by prop, not zero branch length
lentinj Aug 28, 2026
a0643f8
tree_build: Drop dangling mrcaimp leaves before removing unary nodes
lentinj Aug 28, 2026
e9f9fda
tree_build: Regenerate branch lengths from the final dates
lentinj Aug 28, 2026
f30f37d
step_popularity: Share popularity between OTTs duplicating a Qid
lentinj Aug 28, 2026
045a9f9
step_graft: Remove ancestors left empty by subtree extraction
lentinj Aug 28, 2026
0261b4e
step_treeprop: Remove sliding-window / weighted-mean
lentinj Aug 28, 2026
4af34c5
step_output: Write \N for missing values, not empty strings
lentinj Aug 28, 2026
2d32f96
step_output: Temporary parent value, not NULL
lentinj Aug 28, 2026
754077b
step_treeprop: Sync GEOLOGICAL_PERIODS colours
lentinj Aug 28, 2026
d0463f4
dvc.lock: Update with replacement pipeline
lentinj Aug 28, 2026
a0553b8
.github/workflows/dvc.yml: make_js_treefiles -> versioned_outputs
lentinj Aug 28, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/dvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
run: |
python3 -m pip install --upgrade pip
python3 -m pip install '.[dev]'
python3 -m pip install -r requirements.txt
- name: Checkout merge ref
if: github.event_name == 'pull_request_target'
uses: actions/checkout@v7
Expand All @@ -44,6 +45,6 @@ jobs:
[ -n "${{ secrets.DVC_READONLY_SECRET_ACCESS_KEY }}" ] || { echo "DVC_READONLY_SECRET_ACCESS_KEY secret is not set"; exit 1; }
dvc remote modify onezoom-r2 access_key_id ${{ secrets.DVC_READONLY_ACCESS_KEY_ID }}
dvc remote modify onezoom-r2 secret_access_key ${{ secrets.DVC_READONLY_SECRET_ACCESS_KEY }}
dvc freeze make_js_treefiles
dvc freeze versioned_outputs
dvc repro --allow-missing --dry | tee /dev/stderr | grep -q "Data and pipelines are up to date."
if dvc data status --not-in-remote | grep -q "Not in remote"; then exit 1; fi
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install dependencies
run: |
python3 -m pip install --upgrade pip
python3 -m pip install '.[dev]'
python3 -m pip install -r requirements.txt
- name: Test with pytest
run: |
python3 -m pytest tests --conf-file tests/appconfig.ini
Expand Down
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The first step to using this repo is to create a Python virtual environment and
source .venv/bin/activate

# Install it
pip install -e '.[dev]'
pip install -r requirements.txt

# Set up git hooks including linting and DVC
pre-commit install --hook-type pre-push --hook-type post-checkout --hook-type pre-commit
Expand Down
5 changes: 5 additions & 0 deletions data/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
/js_output
/output_files
/node_ages.json
/dated_tree/
/taxon_map.csv
/out
/out_versioned

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Loading
Loading