diff --git a/README.md b/README.md index 7d9f23d..281ef05 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ meta = SigMFFile( SigMFFile.SAMPLE_RATE_KEY: 48000, SigMFFile.AUTHOR_KEY: 'jane.doe@domain.org', SigMFFile.DESCRIPTION_KEY: 'All zero complex float32 example file.', + SigMFFile.VERSION_KEY: "1.2.0" } ) @@ -187,6 +188,7 @@ meta_ci16 = SigMFFile( SigMFFile.DATATYPE_KEY: 'ci16_le', # get_data_type_str() is only valid for numpy types SigMFFile.SAMPLE_RATE_KEY: 48000, SigMFFile.DESCRIPTION_KEY: 'All zero complex int16 file.', + SigMFFile.VERSION_KEY: "1.2.0" } ) meta_ci16.add_capture(0, metadata=meta.get_capture_info(0)) diff --git a/sigmf/sigmffile.py b/sigmf/sigmffile.py index 1ef5702..0ed5f3b 100644 --- a/sigmf/sigmffile.py +++ b/sigmf/sigmffile.py @@ -195,6 +195,7 @@ def __init__(self, self.data_file = None self.sample_count = 0 self._memmap = None + self.name = name self.is_complex_data = False # numpy.iscomplexobj(self._memmap) is not adequate for fixed-point complex case if metadata is None: diff --git a/tests/conftest.py b/tests/conftest.py index d2edcd8..ca181e2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -72,7 +72,7 @@ def test_alternate_sigmffile(test_data_file_2): @pytest.fixture def test_alternate_sigmffile_2(test_data_file_3): """If pytest uses this signature, will return valid SigMF file.""" - meta = SigMFFile() + meta = SigMFFile("test") meta.set_global_field("core:datatype", "rf32_le") meta.set_global_field("core:version", __specification__) meta.add_annotation(start_index=0, length=len(TEST_FLOAT32_DATA_3)) diff --git a/tests/test_archivereader.py b/tests/test_archivereader.py index c55c27e..308eeb4 100644 --- a/tests/test_archivereader.py +++ b/tests/test_archivereader.py @@ -6,12 +6,16 @@ """Tests for SigMFArchiveReader""" +import os +import shutil import tempfile import unittest import numpy as np from sigmf import SigMFArchiveReader, SigMFFile, __specification__ +from sigmf.archive import SIGMF_METADATA_EXT, SigMFArchive +from sigmf.sigmffile_collection import SigMFFileCollection class TestArchiveReader(unittest.TestCase): diff --git a/tests/testdata.py b/tests/testdata.py index 98c627a..5f11d04 100644 --- a/tests/testdata.py +++ b/tests/testdata.py @@ -32,7 +32,7 @@ SigMFFile.DATATYPE_KEY: 'rf32_le', SigMFFile.HASH_KEY: 'a85018cf117a4704596c0f360dbc3fce2d0d561966d865b9b8a356634161bde6a528c5181837890a9f4d54243e2e8eaf7e19bd535e54e3e34aabf76793723d03', SigMFFile.NUM_CHANNELS_KEY: 1, - SigMFFile.VERSION_KEY: '1.0.0' + SigMFFile.VERSION_KEY: __specification__, } } @@ -45,7 +45,7 @@ SigMFFile.DATATYPE_KEY: 'rf32_le', SigMFFile.HASH_KEY: '089753bd48a1724c485e822eaf4d510491e4e54faa83cc3e7b3f18a9f651813190862aa97c922278454c66f20a741050762e008cbe4f96f3bd0dcdb7d720179d', SigMFFile.NUM_CHANNELS_KEY: 1, - SigMFFile.VERSION_KEY: '1.0.0' + SigMFFile.VERSION_KEY: __specification__, } }