Merge branch 'release/v3.2.6' into main

docs/conf.py

@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'idelib'
-copyright = '2021, Mide Technology Corp.'
+copyright = '2022, Mide Technology Corp.'
 author = 'David Randall Stokes'
 
 # The short X.Y version
@@ -42,6 +42,7 @@
     'sphinx.ext.doctest',
     'sphinx.ext.ifconfig',
     'sphinx.ext.githubpages',
+    'nbsphinx',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

idelib/__init__.py

@@ -5,12 +5,19 @@
 """
 
 __author__ = "David Randall Stokes"
-__copyright__ = "Copyright (c) 2021 Midé Technology"
+__copyright__ = "Copyright (c) 2022 Midé Technology"
 
-__maintainer__ = "Mide Technology"
+__maintainer__ = "Midé Technology"
 __email__ = "help@mide.com"
 
 __version__ = (3, 2, 4)
 __status__ = "Production/Stable"
 
 from .importer import importFile
+
+# Add EBML schema path to ebmlite search paths
+import ebmlite
+
+SCHEMA_PATH = "{idelib}/schemata"
+if SCHEMA_PATH not in ebmlite.SCHEMA_PATH:
+    ebmlite.SCHEMA_PATH.insert(0, SCHEMA_PATH)

requirements.txt

@@ -4,5 +4,5 @@ pytest>=4.6
 pytest-xdist[psutil]
 mock
 pytest-cov
-sphinx
+sphinx==4.2.0
 scipy;python_version<"3.10"

setup.py

@@ -13,13 +13,14 @@
     'pytest-xdist[psutil]',
     'mock',
     'pytest-cov',
-    'sphinx',
+    'sphinx==4.2.0',
     'scipy;python_version<"3.10"',
     ]
 
 DOCS_REQUIRES = [
-    "sphinx",
-    "pydata-sphinx-theme",
+    "sphinx==4.2.0",
+    "pydata-sphinx-theme==0.7.2",
+    "nbsphinx",
     ]
 
 EXAMPLE_REQUIRES = [
@@ -28,7 +29,7 @@
 
 setuptools.setup(
         name='idelib',
-        version='3.2.5',
+        version='3.2.6',
         author='Mide Technology',
         author_email='help@mide.com',
         description='Python API for accessing IDE data recordings',

testing/test_dataset.py

@@ -285,7 +285,6 @@ def testConstructor(self):
         self.assertEqual(self.dataset.plots, {})
         self.assertEqual(self.dataset.recorderConfig, None)
         self.assertEqual(self.dataset.recorderInfo, {})
-        self.assertEqual(self.dataset.schemaVersion, 2)
         self.assertEqual(self.dataset.sensors, {})
         self.assertEqual(self.dataset.sessions, [])
         self.assertEqual(self.dataset.subsets, [])