Skip to content

Commit

Permalink
Fix tests (#1165)
Browse files Browse the repository at this point in the history
* Fix tests, run test on PR

* Update changelog

* Inherit secrets in PR tests run

* Revert run on PR
  • Loading branch information
CBroz1 authored Oct 15, 2024
1 parent 398927a commit 6be6b71
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Tests

on:
push:
branches:
branches:
- '!test_branch'
- '!documentation'
schedule: # once a day at midnight UTC
Expand Down Expand Up @@ -53,16 +53,16 @@ jobs:
sudo apt-get install mysql-client libmysqlclient-dev libgirepository1.0-dev -y
sudo apt-get install ffmpeg libsm6 libxext6 -y # non-dlc position deps
- name: Run pip install for test deps
run: |
run: |
pip install --quiet .[test]
- name: Download data
env:
BASEURL: ftps://ftp.box.com/trodes_to_nwb_test_data/
NWBFILE: minirec20230622.nwb # Relative to Base URL
VID_ONE: 20230622_sample_01_a1/20230622_sample_01_a1.1.h264
VID_TWO: 20230622_sample_02_a1/20230622_sample_02_a1.1.h264
RAW_DIR: /home/runner/work/spyglass/spyglass/tests/_data/raw/
VID_DIR: /home/runner/work/spyglass/spyglass/tests/_data/video/
RAW_DIR: /home/runner/work/spyglass/spyglass/tests/_data/raw/
VID_DIR: /home/runner/work/spyglass/spyglass/tests/_data/video/
run: |
mkdir -p $RAW_DIR $VID_DIR
wget_opts() { # Declare func with download options
Expand All @@ -76,4 +76,4 @@ jobs:
wget_opts $VID_DIR $VID_TWO
- name: Run tests
run: |
pytest --no-docker --no-dlc
pytest --no-docker --no-dlc
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ dj.FreeTable(dj.conn(), "common_session.session_group").drop()
- Update DataJoint install and password instructions #1131
- Fix dandi upload process for nwb's with video or linked objects #1095, #1151
- Minor docs fixes #1145
- Remove stored hashes from pytests #1152
- Remove mambaforge from tests #1153
- Test fixes
- Remove stored hashes from pytests #1152
- Remove mambaforge from tests #1153
- Remove debug statement #1164

### Pipelines

Expand Down
1 change: 0 additions & 1 deletion src/spyglass/utils/dj_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def dj_topo_sort(graph: DiGraph) -> List[str]:
List[str]
List of table names in topological order
"""
__import__("pdb").set_trace()
try: # Datajoint 0.14.2+ uses topo_sort instead of unite_master_parts
from datajoint.dependencies import topo_sort

Expand Down

0 comments on commit 6be6b71

Please sign in to comment.