Merge branch 'backwards_tree' of github.com:astheeggeggs/tskit into b…

…ackwards_tree
tskit-dev · Jul 13, 2023 · 234e5b0 · 234e5b0
2 parents 487b513 + 385d6d2
commit 234e5b0
Show file tree

Hide file tree

Showing 17 changed files with 2,244 additions and 34 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -34,11 +34,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
-          cache-dependency-path: python/requirements/development.txt
+          cache-dependency-path: python/requirements/benchmark.txt
       - name: Install deps
-        run: pip install -r python/requirements/development.txt
+        run: pip install -r python/requirements/benchmark.txt
       - name: Build module
         run: |
           cd python
@@ -83,7 +83,7 @@ jobs:
             /usr/share/miniconda/envs/anaconda-client-env
             ~/osx-conda
             ~/.profile
-          key: ${{ runner.os }}-${{ matrix.python}}-conda-v11-${{ hashFiles('python/requirements/CI-tests-conda/requirements.txt') }}-${{ hashFiles('python/requirements/CI-tests-pip/requirements.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python}}-conda-v12-${{ hashFiles('python/requirements/CI-tests-conda/requirements.txt') }}-${{ hashFiles('python/requirements/CI-tests-pip/requirements.txt') }}
 
       - name: Install Conda
         uses: conda-incubator/setup-miniconda@v2