Skip to content

Commit

Permalink
Merge branch 'sigmf:main' into coding_style
Browse files Browse the repository at this point in the history
  • Loading branch information
GreenK173 authored Dec 19, 2024
2 parents fb258f6 + e83a865 commit c446e88
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sigmf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

# version of this python module
__version__ = "1.2.4"
__version__ = "1.2.5"
# matching version of the SigMF specification
__specification__ = "1.2.0"

Expand Down
4 changes: 2 additions & 2 deletions sigmf/sigmffile.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,9 @@ def set_metadata(self, metadata):

def set_global_info(self, new_global):
"""
Overwrite the global info with a new dictionary.
Recursively override existing global metadata with new global metadata.
"""
self._metadata[self.GLOBAL_KEY] = new_global.copy()
self._metadata[self.GLOBAL_KEY] = dict_merge(self._metadata[self.GLOBAL_KEY], new_global)

def get_global_info(self):
"""
Expand Down

0 comments on commit c446e88

Please sign in to comment.