Skip to content

Commit 0883c17

Browse files
authored
Merge branch 'main' into MMathisLab-data
2 parents 3b88f25 + a74101f commit 0883c17

File tree

3 files changed

+866
-2441
lines changed

3 files changed

+866
-2441
lines changed

.github/workflows/testing.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-latest, macos-latest, windows-latest]
17-
python-version: ["3.12", "3.13"]
16+
os: [ubuntu-latest, macos-latest] #windows-latest
17+
python-version: ["3.9", "3.10"] #3.11+ issues with TF
18+
exclude:
19+
- os: macos-latest
20+
python-version: "3.9"
1821
include:
1922
- os: ubuntu-latest
2023
path: ~/.cache/pip
2124
- os: macos-latest
2225
path: ~/Library/Caches/pip
23-
- os: windows-latest
24-
path: ~\AppData\Local\pip\Cache
2526

2627
steps:
2728
- name: Checkout code
@@ -55,8 +56,19 @@ jobs:
5556
shell: bash -el {0} # Important: activates the conda environment
5657
run: |
5758
conda install pytables==3.8.0 "numpy<2"
58-
- name: Install and test
59-
run: |
60-
python -m pip install --upgrade pip wheel poetry
61-
python -m poetry install
62-
python -m poetry run dlc-live-test --nodisplay
59+
60+
- name: Install dependencies via Conda
61+
shell: bash -el {0}
62+
run: conda install -y "numpy>=1.26,<2.0"
63+
64+
- name: Install Poetry
65+
run: pip install --upgrade pip wheel poetry
66+
67+
- name: Regenerate Poetry lock
68+
run: poetry lock --no-cache
69+
70+
- name: Install project dependencies
71+
run: poetry install --no-root
72+
73+
- name: Run DLC Live Tests
74+
run: poetry run dlc-live-test --nodisplay

0 commit comments

Comments
 (0)