From 9856ffe56e10b5cfc29ffcceefa0310f94b685a6 Mon Sep 17 00:00:00 2001 From: Paul Adkisson Date: Fri, 13 Sep 2024 10:28:52 +1000 Subject: [PATCH] updated requirements to include cv2 and update dev testing locations for neuroconv (#357) * updated requirements to include cv2 * updated dev testing locations * updated changelog --- .github/workflows/dev-testing.yaml | 2 +- CHANGELOG.md | 1 + requirements-full.txt | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-testing.yaml b/.github/workflows/dev-testing.yaml index 9f35c616..38652151 100644 --- a/.github/workflows/dev-testing.yaml +++ b/.github/workflows/dev-testing.yaml @@ -47,4 +47,4 @@ jobs: - name: Run NeuroConv tests run: | - pytest -n auto --dist loadscope neuroconv/tests/test_ophys neuroconv/tests/test_on_data/test_imaging_interfaces.py neuroconv/tests/test_on_data/test_segmentation_interfaces.py + pytest -n auto --dist loadscope neuroconv/tests/test_ophys neuroconv/tests/test_on_data/ophys/test_imaging_interfaces.py neuroconv/tests/test_on_data/ophys/test_segmentation_interfaces.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 856c85f6..62d7ec67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ * Change the criteria of determining if Bruker data is volumetric [#342](https://github.com/catalystneuro/roiextractors/pull/342) * Fixes a bug that assumes the channel name is is on the tiff file for `BrukerTiffSinglePlaneImagingExtractor` [#343](https://github.com/catalystneuro/roiextractors/pull/343) * Including `packaging` explicitly in minimal requirements [#347](https://github.com/catalystneuro/roiextractors/pull/347) +* Updated requirements to include cv2 and update dev testing locations for neuroconv: [#357](https://github.com/catalystneuro/roiextractors/pull/357) ### Improvements diff --git a/requirements-full.txt b/requirements-full.txt index 81f42bf2..3d4219ef 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -1,5 +1,8 @@ tifffile>=2018.10.18 scanimage-tiff-reader>=1.4.1.4 neuroconv[video]>=0.4.6 # Uses the VideoCaptureContext class +opencv-python-headless>=4.5.1.48 +opencv-python-headless>=4.5.1.48,<4.7.0.72; sys_platform == 'darwin' +opencv-python-headless>=4.5.1.48,<4.7; sys_platform == 'darwin' and python_version>='3.11' natsort>=8.3.1 isx>=1.0.4