Skip to content

Commit 6be6b71

Browse files
authored
Fix tests (#1165)
* Fix tests, run test on PR * Update changelog * Inherit secrets in PR tests run * Revert run on PR
1 parent 398927a commit 6be6b71

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/test-conda.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- '!test_branch'
77
- '!documentation'
88
schedule: # once a day at midnight UTC
@@ -53,16 +53,16 @@ jobs:
5353
sudo apt-get install mysql-client libmysqlclient-dev libgirepository1.0-dev -y
5454
sudo apt-get install ffmpeg libsm6 libxext6 -y # non-dlc position deps
5555
- name: Run pip install for test deps
56-
run: |
56+
run: |
5757
pip install --quiet .[test]
5858
- name: Download data
5959
env:
6060
BASEURL: ftps://ftp.box.com/trodes_to_nwb_test_data/
6161
NWBFILE: minirec20230622.nwb # Relative to Base URL
6262
VID_ONE: 20230622_sample_01_a1/20230622_sample_01_a1.1.h264
6363
VID_TWO: 20230622_sample_02_a1/20230622_sample_02_a1.1.h264
64-
RAW_DIR: /home/runner/work/spyglass/spyglass/tests/_data/raw/
65-
VID_DIR: /home/runner/work/spyglass/spyglass/tests/_data/video/
64+
RAW_DIR: /home/runner/work/spyglass/spyglass/tests/_data/raw/
65+
VID_DIR: /home/runner/work/spyglass/spyglass/tests/_data/video/
6666
run: |
6767
mkdir -p $RAW_DIR $VID_DIR
6868
wget_opts() { # Declare func with download options
@@ -76,4 +76,4 @@ jobs:
7676
wget_opts $VID_DIR $VID_TWO
7777
- name: Run tests
7878
run: |
79-
pytest --no-docker --no-dlc
79+
pytest --no-docker --no-dlc

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ dj.FreeTable(dj.conn(), "common_session.session_group").drop()
3030
- Update DataJoint install and password instructions #1131
3131
- Fix dandi upload process for nwb's with video or linked objects #1095, #1151
3232
- Minor docs fixes #1145
33-
- Remove stored hashes from pytests #1152
34-
- Remove mambaforge from tests #1153
33+
- Test fixes
34+
- Remove stored hashes from pytests #1152
35+
- Remove mambaforge from tests #1153
36+
- Remove debug statement #1164
3537

3638
### Pipelines
3739

src/spyglass/utils/dj_graph.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def dj_topo_sort(graph: DiGraph) -> List[str]:
5454
List[str]
5555
List of table names in topological order
5656
"""
57-
__import__("pdb").set_trace()
5857
try: # Datajoint 0.14.2+ uses topo_sort instead of unite_master_parts
5958
from datajoint.dependencies import topo_sort
6059

0 commit comments

Comments
 (0)