Merge branch 'release/5.0.0'

Author: hbredin

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7]
+        python-version: [3.7, 3.8, 3.9, '3.10']
 
     steps:
     - uses: actions/checkout@v1

doc/source/changelog.rst

@@ -2,6 +2,11 @@
 Changelog
 #########
 
+Version 5.0.0 (2022-12-15)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- BREAKING: remove support for JSON serialization
+
 Version 4.5 (2022-08-24)
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

doc/source/index.rst

@@ -35,7 +35,6 @@ User guide
 
    structure
    visualization
-   serialization
 
 
 API documentation

doc/source/reference.rst

@@ -51,13 +51,6 @@ SlidingWindowFeature
    :members:
    :special-members:
 
-*************
-Serialization
-*************
-
-.. automodule:: pyannote.core.json
-   :members:
-
 *************
 Visualization
 *************

doc/source/serialization.rst

@@ -128,13 +128,10 @@
 from sortedcontainers import SortedDict
 
 from . import (
-    PYANNOTE_URI,
-    PYANNOTE_MODALITY,
     PYANNOTE_SEGMENT,
     PYANNOTE_TRACK,
     PYANNOTE_LABEL,
 )
-from .json import PYANNOTE_JSON, PYANNOTE_JSON_CONTENT
 from .segment import Segment, SlidingWindow
 from .timeline import Timeline
 from .feature import SlidingWindowFeature
@@ -1499,47 +1496,6 @@ def discretize(
 
         return SlidingWindowFeature(data, resolution, labels=labels)
 
-    def for_json(self) -> Dict:
-        """Serialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-
-        data = {PYANNOTE_JSON: self.__class__.__name__}
-        content = [
-            {PYANNOTE_SEGMENT: s.for_json(), PYANNOTE_TRACK: t, PYANNOTE_LABEL: l}
-            for s, t, l in self.itertracks(yield_label=True)
-        ]
-        data[PYANNOTE_JSON_CONTENT] = content
-
-        if self.uri:
-            data[PYANNOTE_URI] = self.uri
-
-        if self.modality:
-            data[PYANNOTE_MODALITY] = self.modality
-
-        return data
-
-    @classmethod
-    def from_json(cls, data: Dict) -> "Annotation":
-        """Deserialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-        uri = data.get(PYANNOTE_URI, None)
-        modality = data.get(PYANNOTE_MODALITY, None)
-        records = []
-        for record_dict in data[PYANNOTE_JSON_CONTENT]:
-            segment = Segment.from_json(record_dict[PYANNOTE_SEGMENT])
-            track = record_dict[PYANNOTE_TRACK]
-            label = record_dict[PYANNOTE_LABEL]
-            records.append((segment, track, label))
-        return Annotation.from_records(records, uri, modality)
-
     @classmethod
     def from_records(
         cls,

pyannote/core/annotation.py

@@ -368,25 +368,6 @@ def __repr__(self):
         """
         return '<Segment(%g, %g)>' % (self.start, self.end)
 
-    def for_json(self):
-        """Serialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-        return {'start': self.start, 'end': self.end}
-
-    @classmethod
-    def from_json(cls, data):
-        """Deserialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-        return cls(start=data['start'], end=data['end'])
-
     def _repr_png_(self):
         """IPython notebook support
 

pyannote/core/json.py

@@ -94,8 +94,7 @@
 
 from sortedcontainers import SortedList
 
-from . import PYANNOTE_URI, PYANNOTE_SEGMENT
-from .json import PYANNOTE_JSON, PYANNOTE_JSON_CONTENT
+from . import PYANNOTE_SEGMENT
 from .segment import Segment
 from .utils.types import Support, Label, CropMode
 
@@ -1110,35 +1109,6 @@ def write_uem(self, file: TextIO):
         for line in self._iter_uem():
             file.write(line)
 
-    def for_json(self):
-        """Serialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-
-        data = {PYANNOTE_JSON: self.__class__.__name__}
-        data[PYANNOTE_JSON_CONTENT] = [s.for_json() for s in self]
-
-        if self.uri:
-            data[PYANNOTE_URI] = self.uri
-
-        return data
-
-    @classmethod
-    def from_json(cls, data):
-        """Deserialization
-
-        See also
-        --------
-        :mod:`pyannote.core.json`
-        """
-
-        uri = data.get(PYANNOTE_URI, None)
-        segments = [Segment.from_json(s) for s in data[PYANNOTE_JSON_CONTENT]]
-        return cls(segments=segments, uri=uri)
-
     def _repr_png_(self):
         """IPython notebook support
 

pyannote/core/segment.py

@@ -39,7 +39,6 @@
         'sortedcontainers >= 2.0.4',
         'numpy >= 1.10.4',
         'scipy >= 1.1',
-        'simplejson >= 3.8.1',
         "dataclasses >= 0.7; python_version <'3.7'",
         'typing-extensions >= 3.7.4.1'
     ],