Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5c6ecdb
Fix SVG pack_untracked_polytomies bug
hyanwong Nov 6, 2024
d61a8b6
minor wording in error message
petrelharp Nov 2, 2024
a6f8195
Merge pull request #3044 from tskit-dev/petrelharp-patch-1
benjeffery Nov 7, 2024
2c0509f
Fix wrong output dim in pair_coalescence_counts with extra time windows
nspope Nov 19, 2024
b99dfe7
Update changelog
nspope Nov 19, 2024
f6b27ed
ci(mergify): upgrade configuration to current format
mergify[bot] Nov 20, 2024
a25ef3c
Merge pull request #3060 from tskit-dev/mergify/configuration-depreca…
benjeffery Nov 20, 2024
b31d4d1
Merge pull request #3058 from nspope/fix-coalrate-timedim
jeromekelleher Nov 20, 2024
8cd494a
Normalise pair coalescence counts by nonmissing span per window
nspope Nov 19, 2024
aea14d5
Better edge metadata error
benjeffery Nov 22, 2024
17b1b85
Correct link to fwdpp
hyanwong Dec 2, 2024
846158d
Nicer links
hyanwong Dec 2, 2024
9dcae00
Merge pull request #3065 from hyanwong/fwdpp-url
jeromekelleher Dec 2, 2024
d1d5bb7
Add note re deleting only the mutations
hyanwong Dec 3, 2024
6c5f497
Update GitHub Actions to latest major versions
benjeffery Dec 11, 2024
214f1cd
Merge pull request #3070 from benjeffery/update-actions-2412
benjeffery Dec 11, 2024
be5351d
Update actions ubuntu version
benjeffery Dec 12, 2024
14f8ed2
Merge pull request #3072 from benjeffery/update-ubuntu-2412
benjeffery Dec 12, 2024
26f9c4a
Update actions ubuntu version
benjeffery Jan 8, 2025
af21766
Merge pull request #3076 from benjeffery/update-ubuntu-2412
benjeffery Jan 8, 2025
ffecae9
Add textual mouseover descriptions of collapsed nodes
hyanwong Nov 14, 2024
0427239
add GIL release for statistics
hanbin973 Jan 8, 2025
c807c1e
Pin zarr
benjeffery Jan 15, 2025
9fb8a52
Fix doxygen version
benjeffery Feb 7, 2025
53f7555
Merge pull request #3085 from benjeffery/fix-docs-3
benjeffery Feb 10, 2025
25a9994
Update conda dev env
benjeffery Feb 7, 2025
af33ed1
Add fixed-length arrays in metadata
benjeffery Feb 28, 2025
a26bafa
get items from bit arrays; add a few tests
lkirk Nov 6, 2024
bca015a
c implementation of python algorithm
lkirk Nov 6, 2024
519f30b
fix memory issue; turns out the allocated stack wasnt big enough.
lkirk Nov 6, 2024
529ffb6
norm_total_weighted for D_prime
lkirk Dec 18, 2024
1b55974
Revert "norm_total_weighted for D_prime"
lkirk Mar 5, 2025
0fa68c4
add coverage for tsk_bit_array_get_items
lkirk Mar 12, 2025
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
14 changes: 8 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
build-deploy-docs:
name: Docs
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
defaults:
run:
shell: bash -l {0}
Expand All @@ -27,16 +27,16 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v4
- uses: actions/checkout@v4.2.2

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v3.1.0
with:
miniforge-version: latest
activate-environment: tskit-docs-env

- name: Cache Conda env
uses: actions/cache@v4
uses: actions/cache@v4.2.0
with:
path: ${{ env.CONDA }}/envs
key: conda-${{ runner.os }}--${{ runner.arch }}--${{ hashFiles(env.REQUIREMENTS) }}-${{ env.CACHE_NUMBER }}
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Update environment
run: |
mamba install -y python=3.10 doxygen pip
mamba install -y python=3.10 doxygen=1.12.0 pip
pip install -r ${{ env.REQUIREMENTS }}
if: steps.cache.outputs.cache-hit != 'true'

Expand All @@ -55,7 +55,9 @@ jobs:
run: make $MAKE_TARGET

- name: Build Docs
run: make -C docs
run: |
doxygen -v
make -C docs

- name: Trigger docs site rebuild
if: github.ref == 'refs/heads/main'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5.3.0
with:
python-version: '3.12'
- name: Install dependencies and set up venv
Expand All @@ -39,7 +39,7 @@ jobs:
run:
echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
- name: C Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2.2.0
if: startsWith(github.ref, 'refs/tags/') && contains(github.event.ref, 'C_')
with:
name: C API ${{ steps.get_version.outputs.VERSION }}
Expand All @@ -48,7 +48,7 @@ jobs:
fail_on_unmatched_files: True
files: build-gcc/meson-dist/*
- name: Python Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2.2.0
if: startsWith(github.ref, 'refs/tags/') && !contains(github.event.ref, 'C_')
with:
name: Python ${{ steps.get_version.outputs.VERSION }}
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:
jobs:
pre-commit:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v4.2.2
- uses: actions/setup-python@v5.3.0
with:
python-version: '3.10'
- name: install clang-format
Expand All @@ -24,16 +24,16 @@ jobs:
python -m venv env
source env/bin/activate
pip install clang-format==6.0.1
- uses: pre-commit/action@v3.0.0
- uses: pre-commit/action@v3.0.1

benchmark:
name: Benchmark
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v4.2.2
- uses: actions/setup-python@v5.3.0
with:
python-version: '3.11'
cache: 'pip'
Expand All @@ -50,7 +50,7 @@ jobs:
pip uninstall -y tskit
python run.py
- name: Upload Results
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.3
with:
name: benchmark-results
path: python/benchmark
Expand All @@ -62,7 +62,7 @@ jobs:
fail-fast: false
matrix:
python: [ 3.9, 3.12 ]
os: [ macos-latest, ubuntu-latest, windows-latest ]
os: [ macos-latest, ubuntu-24.04, windows-latest ]
defaults:
run:
shell: bash
Expand All @@ -73,7 +73,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4.2.2

- name: Install OSX libs
if: matrix.os == 'macos-latest'
Expand All @@ -82,13 +82,13 @@ jobs:

- name: Cache conda and dependencies
id: cache
uses: actions/cache@v4
uses: actions/cache@v4.2.0
with:
path: ${{ env.CONDA }}/envs
key: ${{ runner.os }}-${{ runner.arch }}-${{ matrix.python}}-conda-v1-${{ hashFiles('python/requirements/CI-tests-conda/requirements.txt') }}-${{ hashFiles('python/requirements/CI-tests-pip/requirements.txt') }}

- name: Install Conda
uses: conda-incubator/setup-miniconda@v3
uses: conda-incubator/setup-miniconda@v3.1.0
if: steps.cache.outputs.cache-hit != 'true'
with:
activate-environment: anaconda-client-env
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
python -m pytest -x --cov=tskit --cov-report=xml --cov-branch -n2 --durations=20 tests

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5.1.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
working-directory: python
Expand All @@ -168,10 +168,10 @@ jobs:
access_token: ${{ github.token }}

- name: 'Checkout'
uses: actions/checkout@v4
uses: actions/checkout@v4.2.2

- name: Setup MSYS2 ${{matrix.sys}}
uses: msys2/setup-msys2@v2
uses: msys2/setup-msys2@v2.26.0
with:
msystem: ${{matrix.sys}}
update: true
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
python: [3.9, "3.10", 3.11, 3.12]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ matrix.python }}
- name: Install deps
Expand All @@ -36,7 +36,7 @@ jobs:
pip install delocate
delocate-wheel -v dist/*.whl
- name: Upload Wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.3
with:
name: osx-wheel-${{ matrix.python }}
path: python/dist
Expand All @@ -49,7 +49,7 @@ jobs:
wordsize: [64]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.2.2
- name: Install deps
env:
PYTHON: "py -${{ matrix.python }}-${{ matrix.wordsize }}"
Expand All @@ -74,19 +74,19 @@ jobs:
cp ../c/tskit.h lib/.
${PYTHON} -m build --wheel
- name: Upload Wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.3
with:
name: win-wheel-${{ matrix.python }}-${{ matrix.wordsize }}
path: python/dist

manylinux:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.2.2

- name: Set up Python 3.9
uses: actions/setup-python@v5
uses: actions/setup-python@v5.3.0
with:
python-version: 3.9

Expand All @@ -98,7 +98,7 @@ jobs:
python -m build --sdist

- name: Upload sdist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.3
with:
name: sdist
path: python/dist
Expand All @@ -109,7 +109,7 @@ jobs:
docker run --rm -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_x86_64 bash .github/workflows/docker/buildwheel.sh

- name: Upload Wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v4.4.3
with:
name: linux-wheels
path: python/dist/wheelhouse
Expand All @@ -122,11 +122,11 @@ jobs:
python: [3.9, "3.10", 3.11, 3.12]
steps:
- name: Download wheels
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
with:
name: osx-wheel-${{ matrix.python }}
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ matrix.python }}
- name: Install wheel and test
Expand All @@ -145,11 +145,11 @@ jobs:
wordsize: [64]
steps:
- name: Download wheels
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
with:
name: win-wheel-${{ matrix.python }}-${{ matrix.wordsize }}
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ matrix.python }}
- name: Install wheel and test
Expand All @@ -161,7 +161,7 @@ jobs:
python -c "import tskit"

manylinux-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: ['manylinux']
strategy:
matrix:
Expand All @@ -178,11 +178,11 @@ jobs:
wheel: cp312
steps:
- name: Download wheels
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
with:
name: linux-wheels
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ matrix.python }}
- name: Install wheel and test
Expand All @@ -194,23 +194,23 @@ jobs:


PyPI_Upload:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment: release
needs: ['windows-test', 'OSX-test', 'manylinux-test']
permissions:
id-token: write
steps:
- name: Download all
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
- name: Move to dist
run: |
mkdir dist
cp */*.{whl,gz} dist/.
- name: Publish distribution to Test PyPI
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && !contains(github.event.ref, 'C_')
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@v1.12.3
with:
repository_url: https://test.pypi.org/legacy/
- name: Publish distribution to PRODUCTION PyPI
if: github.event_name == 'release' && !startsWith(github.event.release.tag_name, 'C_')
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@v1.12.3
Loading
Loading