Merge pull request #270 from pynapple-org/fix_iset_repr

Fixing repr of iset

docs/HISTORY.md

@@ -9,6 +9,12 @@ In 2018, Francesco started neuroseries, a Python package built on Pandas. It was
 In 2021, Guillaume and other trainees in Adrien's lab decided to fork from neuroseries and started *pynapple*. The core of pynapple is largely built upon neuroseries. Some of the original changes to TSToolbox made by Luke were included in this package, especially the *time_support* property of all ts/tsd objects.
 
 
+0.6.4 (2024-04-18)
+------------------
+
+- Fixing IntervalSet `__repr__`. Tabulate conflict with numpy 1.26.
+
+
 0.6.3 (2024-04-17)
 ------------------
 

pynapple/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 from .core import IntervalSet, Ts, Tsd, TsdFrame, TsdTensor, TsGroup, TsIndex, config
 from .io import *
 from .process import *

pynapple/core/interval_set.py

@@ -170,7 +170,7 @@ def __init__(self, start, end=None, time_units="s", **kwargs):
         self.nap_class = self.__class__.__name__
 
     def __repr__(self):
-        headers = ["start", "end"]
+        headers = [" " * 6, "start", "end"]
         bottom = "shape: {}, time unit: sec.".format(self.shape)
 
         rows = _get_terminal_size()[1]
@@ -182,17 +182,27 @@ def __repr__(self):
                 warnings.simplefilter("ignore")
                 return (
                     tabulate(
-                        self.values[0:n_rows],
+                        np.hstack(
+                            (self.index[0:n_rows][:, None], self.values[0:n_rows])
+                        ),
                         headers=headers,
-                        showindex=self.index[0:n_rows],
                         tablefmt="plain",
+                        colalign=("left", "center", "center"),
                     )
-                    + "\n\n...\n"
+                    + "\n"
+                    + " " * 10
+                    + "..."
                     + tabulate(
-                        self.values[-n_rows:],
-                        headers=[" " * 5, " " * 3],  # To align properly the columns
-                        showindex=self.index[-n_rows:],
+                        np.hstack(
+                            (self.index[-n_rows:][:, None], self.values[-n_rows:])
+                        ),
+                        headers=[
+                            " " * 6,
+                            " " * 5,
+                            " " * 3,
+                        ],  # To align properly the columns
                         tablefmt="plain",
+                        colalign=("left", "center", "center"),
                     )
                     + "\n"
                     + bottom

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pynapple"
-version = "0.6.3"
+version = "0.6.4"
 description = "PYthon Neural Analysis Package Pour Laboratoires d’Excellence"
 readme = "README.md"
 authors = [{ name = "Guillaume Viejo", email = "[email protected]" }]

setup.py

@@ -59,7 +59,7 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/pynapple-org/pynapple',
-    version='v0.6.3',
+    version='v0.6.4',
     zip_safe=False,
     long_description_content_type='text/markdown',
     download_url='https://github.com/pynapple-org/pynapple/archive/refs/tags/v0.6.0.tar.gz'