Skip to content

Commit 444b382

Browse files
authored
Merge pull request #3841 from zm711/test-cleanup-imports
More cleanup of imports focused mostly on testing and utils around testing
2 parents d15b2c9 + c7b0d9f commit 444b382

26 files changed

+43
-92
lines changed

src/spikeinterface/extractors/tests/test_neoextractors.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import subprocess
44
import os
55
from packaging import version
6+
import importlib.util
67

78
import pytest
89

9-
from spikeinterface.core.testing import check_recordings_equal
1010
from spikeinterface import get_global_dataset_folder
1111
from spikeinterface.extractors import *
1212

@@ -40,11 +40,10 @@ def has_plexon2_dependencies():
4040
return False
4141

4242
# Check for 'zugbruecke' using pip
43-
try:
44-
import zugbruecke
45-
43+
zugbruecke_spec = importlib.util.find_spec("zugbruecke")
44+
if zugbruecke_spec is not None:
4645
return True
47-
except ImportError:
46+
else:
4847
return False
4948
else:
5049
raise ValueError(f"Unsupported OS: {os_type}")

src/spikeinterface/generation/tests/test_drifing_generator.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
import pytest
21
import numpy as np
3-
from pathlib import Path
4-
import shutil
5-
6-
import probeinterface
72

83
from spikeinterface.generation import (
94
make_one_displacement_vector,

src/spikeinterface/postprocessing/principal_component.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class ComputePrincipalComponents(AnalyzerExtension):
4343
If True, waveforms are pre-whitened
4444
dtype : dtype, default: "float32"
4545
Dtype of the pc scores
46+
{}
4647
4748
Examples
4849
--------
@@ -522,8 +523,6 @@ def _transform_waveforms(self, spikes, waveforms, pca_model, progress_bar):
522523
# transform a waveforms buffer
523524
# used by _run() and project_new()
524525

525-
from sklearn.exceptions import NotFittedError
526-
527526
mode = self.params["mode"]
528527

529528
# prepare buffer
@@ -682,6 +681,7 @@ def _init_work_all_pc_extractor(recording, sorting, all_pcs_args, nbefore, nafte
682681
return worker_ctx
683682

684683

684+
ComputePrincipalComponents.__doc__.format(_shared_job_kwargs_doc)
685685
register_result_extension(ComputePrincipalComponents)
686686
compute_principal_components = ComputePrincipalComponents.function_factory()
687687

src/spikeinterface/postprocessing/spike_amplitudes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from __future__ import annotations
22

33
import numpy as np
4-
import warnings
54

65
from spikeinterface.core.job_tools import fix_job_kwargs
76

src/spikeinterface/postprocessing/template_metrics.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ def _set_params(
116116
**other_kwargs,
117117
):
118118

119-
import pandas as pd
120-
121119
# TODO alessio can you check this : this used to be in the function but now we have ComputeTemplateMetrics.function_factory()
122120
if include_multi_channel_metrics or (
123121
metric_names is not None and any([m in get_multi_channel_template_metric_names() for m in metric_names])

src/spikeinterface/postprocessing/tests/test_correlograms.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import numpy as np
22

3-
try:
4-
import numba
3+
import importlib.util
54

5+
numba_spec = importlib.util.find_spec("numba")
6+
if numba_spec is not None:
67
HAVE_NUMBA = True
7-
except ModuleNotFoundError as err:
8+
else:
89
HAVE_NUMBA = False
910

1011
from spikeinterface import NumpySorting, generate_sorting

src/spikeinterface/preprocessing/scale.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
from __future__ import annotations
22

3-
import numpy as np
4-
5-
from spikeinterface.core import BaseRecording
63
from spikeinterface.preprocessing.basepreprocessor import BasePreprocessor
74

85

src/spikeinterface/preprocessing/tests/test_align_snippets.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
but check only for BaseRecording general methods.
44
"""
55

6-
import pytest
7-
import numpy as np
8-
96
from spikeinterface.core import generate_snippets
107
from spikeinterface.preprocessing.align_snippets import AlignSnippets
118

src/spikeinterface/preprocessing/tests/test_filter_gaussian.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import numpy as np
22
import pytest
3-
from pathlib import Path
4-
from spikeinterface.core import load, set_global_tmp_folder
3+
from spikeinterface.core import load
54
from spikeinterface.core.testing import check_recordings_equal
65
from spikeinterface.core.generate import generate_recording
76
from spikeinterface.preprocessing import gaussian_filter

src/spikeinterface/preprocessing/tests/test_highpass_spatial_filter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import spikeinterface.preprocessing as spre
88
import spikeinterface.extractors as se
99
from spikeinterface.core import generate_recording
10-
import spikeinterface.widgets as sw
1110
import importlib.util
1211

1312
ON_GITHUB = bool(os.getenv("GITHUB_ACTIONS"))
@@ -25,7 +24,7 @@
2524

2625

2726
@pytest.mark.skipif(
28-
importlib.util.find_spec("neurodsp") is not None or importlib.util.find_spec("spikeglx") or ON_GITHUB,
27+
importlib.util.find_spec("neurodsp") is None or importlib.util.find_spec("spikeglx") is None or ON_GITHUB,
2928
reason="Only local. Requires ibl-neuropixel install",
3029
)
3130
@pytest.mark.parametrize("lagc", [False, 1, 300])

0 commit comments

Comments
 (0)