Fix nwbmatic for pynapple 0.4

pynapple-org · Oct 16, 2023 · 16f2920 · 16f2920
1 parent 37b0498
commit 16f2920
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/main.py b/main.py
@@ -5,13 +5,15 @@
 import nwbmatic as ntm
 import os, sys, shutil
 import pynapple as nap
+import numpy as np
+import matplotlib.pyplot as plt
 
 DATA_DIRECTORY = "your/path/to/A2929-200711"
 
-try:
-    shutil.rmtree(os.path.join(DATA_DIRECTORY, "pynapplenwb"), ignore_errors=True)
-except:
-    pass
+# try:
+#     shutil.rmtree(os.path.join(DATA_DIRECTORY, "pynapplenwb"), ignore_errors=True)
+# except:
+#     pass
 
 
 # LOADING DATA

diff --git a/nwbmatic/__init__.py b/nwbmatic/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 from .misc import *
diff --git a/nwbmatic/loader.py b/nwbmatic/loader.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # @Author: gviejo
 # @Date:   2022-01-02 23:30:51
-# @Last Modified by:   Guillaume Viejo
-# @Last Modified time: 2023-06-07 12:18:37
+# @Last Modified by:   gviejo
+# @Last Modified time: 2023-10-16 12:29:13
 
 """
 BaseLoader is the general class for loading session with pynapple.
@@ -229,10 +229,10 @@ def _make_position(
                     position = self.load_default_csv(parameters.loc[i, "csv"])
 
                 if alignment.lower() == "local":
-                    start_epoch = nap.format_timestamps(
+                    start_epoch = nap.TsIndex.format_timestamps(
                         epochs.loc[int(parameters.loc[i, "epoch"]), "start"], time_units
                     )
-                    end_epoch = nap.format_timestamps(
+                    end_epoch = nap.TsIndex.format_timestamps(
                         epochs.loc[int(parameters.loc[i, "epoch"]), "end"], time_units
                     )
                     timestamps = (
@@ -268,7 +268,7 @@ def _make_position(
                     # start_epoch = format_timestamp(
                     #     epochs.loc[parameters.loc[f, "epoch"], "start"], time_units
                     # )
-                    start_epoch = nap.format_timestamps(
+                    start_epoch = nap.TsIndex.format_timestamps(
                         epochs.loc[int(parameters.loc[i, "epoch"]), "start"], time_units
                     )
                     timestamps = start_epoch + ttl.index.values

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nwbmatic"
-version = "0.1.0"
+version = "0.1.2"
 description = "NWB creator from various data streams"
 readme = "README.md"
 authors = [{ name = "Guillaume Viejo", email = "guillaume.viejo@gmail.com" }]