Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old pipeline #14

Merged
merged 2 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions projects/_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ class TemplateBpodTrialsExtractor(BaseBpodTrialsExtractor):
:class:`ibllib.io.extractors.mesoscope.TimelineTrials` for examples).

To associate this extractor to your task protocol, you must add it to the
`projects/task_extractor_map.json` file. Additionally you can associate `Alyx procedures`_ (e.g.
'Optical stimulation') to the protocol with the `projects/task_type_procedures.json` file.
`projects/task_extractor_map.json` file.

.. _Alyx procedures: https://openalyx.internationalbrainlab.org/admin/actions/proceduretype/

Expand Down
27 changes: 0 additions & 27 deletions projects/base.py

This file was deleted.

2 changes: 1 addition & 1 deletion projects/ephys_passive_opto.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import one.alf.io as alfio
from ibllib.io.extractors import ephys_fpga
from neurodsp.utils import sync_timestamps
from ibldsp.utils import sync_timestamps
from ibllib.plots import squares, vertical_lines
from ibllib.pipes import tasks

Expand Down
6 changes: 0 additions & 6 deletions projects/extractor_types.json

This file was deleted.

2 changes: 1 addition & 1 deletion projects/krasniak_widefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import ibllib.exceptions as err
from ibllib.pipes.base_tasks import WidefieldTask
import neurodsp as dsp
import ibldsp as dsp
import logging
from one.api import ONE
from ibllib.io.extractors.camera import get_video_length
Expand Down
4 changes: 0 additions & 4 deletions projects/task_type_procedures.json

This file was deleted.

4 changes: 3 additions & 1 deletion projects/tests/test_biased_fibrephotometry.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import unittest
import shutil

import numpy as np
import ibllib.pipes.training_preprocessing as tpp
from projects import biased_fibrephotometry
import one.alf.io as alfio
from one.api import ONE
Expand All @@ -10,6 +10,7 @@
from ci.tests import base


@unittest.skip('old pipeline no longer supported')
class TestBiasedPhotometry(base.IntegrationTest):

def setUp(self) -> None:
Expand All @@ -32,6 +33,7 @@ def setUp(self) -> None:
# link.symlink_to(ff)

def test_extraction(self):
import ibllib.pipes.training_preprocessing as tpp

# Extract the trials (required for photometry extraction)
self.assertEqual(
Expand Down
5 changes: 3 additions & 2 deletions projects/tests/test_ephys_passive_opto.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import unittest
import shutil

import numpy as np
Expand All @@ -6,9 +7,8 @@
from one.api import ONE
from ci.tests import base

from projects.ephys_passive_opto import EphysPassiveOptoTrials


@unittest.skip('old pipeline no longer supported')
class TestEphysPassiveOptoTrials(base.IntegrationTest):

def setUp(self) -> None:
Expand All @@ -21,6 +21,7 @@ def test_ephys_passive_opto(self):
:return:
"""
session_path = self.session_path
from projects.ephys_passive_opto import EphysPassiveOptoTrials
task = EphysPassiveOptoTrials(session_path=session_path, one=self.one_offline)
task.run()

Expand Down
9 changes: 4 additions & 5 deletions projects/tests/test_ephys_training_bandit.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
from ci.tests import base
import unittest

from projects.training_bandit import extract_all as training_extract_all
from projects.ephys_bandit import extract_all as ephys_extract_all


@unittest.skip('old pipeline no longer supported')
class TestTrainingBanditTrials(base.IntegrationTest):

def setUp(self) -> None:
Expand All @@ -21,7 +19,7 @@ def test_training_bandit(self):
Alejandro training bandit task
:return:
"""

from projects.training_bandit import extract_all as training_extract_all
trials, _, _ = training_extract_all(self.session_path, save=False)
trials_orig = alfio.load_object(self.session_path.joinpath('alf'), object='trials')

Expand All @@ -32,6 +30,7 @@ def test_training_bandit(self):
assert np.array_equal(trials['table']['contrastRight'], trials_orig['contrastRight'])


@unittest.skip('old pipeline no longer supported')
class TestEphysBanditTrials(base.IntegrationTest):

@unittest.skip("Skip FTP upload test")
Expand All @@ -44,7 +43,7 @@ def test_ephys_bandit(self):
Alejandro ephys bandit task
:return:
"""

from projects.ephys_bandit import extract_all as ephys_extract_all
trials, _ = ephys_extract_all(self.session_path, save=False)
trials_orig = alfio.load_object(self.session_path.joinpath('alf'), object='trials')

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "project_extraction"
version = "0.2.7"
version = "0.3.0"
description = "Custom extractors for satellite tasks"
dynamic = [ "readme" ]
keywords = [ "IBL", "neuro-science" ]
Expand Down
Loading