mt-metadata 0.3.4__tar.gz → 0.3.5__tar.gz

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mt_metadata
-Version: 0.3.4
+Version: 0.3.5
 Summary: Metadata for magnetotelluric data
 Home-page: https://github.com/kujaku11/mt_metadata
 Author: Jared Peacock
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.rst
 
-# mt_metadata version 0.3.4
+# mt_metadata version 0.3.5
  Standard MT metadata
 
 [![PyPi version](https://img.shields.io/pypi/v/mt_metadata.svg)](https://pypi.python.org/pypi/mt-metadata)
@@ -52,7 +52,7 @@ MT Metadata is a project led by [IRIS-PASSCAL MT Software working group](https:/
 
 Most people will be using the transfer functions, but a lot of that metadata comes from the time series metadata.  This module supports both and has tried to make them more or less seamless to reduce complication.
 
-* **Version**: 0.3.4
+* **Version**: 0.3.5
 * **Free software**: MIT license
 * **Documentation**: https://mt-metadata.readthedocs.io.
 * **Examples**: Click the `Binder` badge above and Jupyter Notebook examples are in **mt_metadata/examples/notebooks** and **docs/source/notebooks**

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/README.md

@@ -1,4 +1,4 @@
-# mt_metadata version 0.3.4
+# mt_metadata version 0.3.5
  Standard MT metadata
 
 [![PyPi version](https://img.shields.io/pypi/v/mt_metadata.svg)](https://pypi.python.org/pypi/mt-metadata)
@@ -28,7 +28,7 @@ MT Metadata is a project led by [IRIS-PASSCAL MT Software working group](https:/
 
 Most people will be using the transfer functions, but a lot of that metadata comes from the time series metadata.  This module supports both and has tried to make them more or less seamless to reduce complication.
 
-* **Version**: 0.3.4
+* **Version**: 0.3.5
 * **Free software**: MIT license
 * **Documentation**: https://mt-metadata.readthedocs.io.
 * **Examples**: Click the `Binder` badge above and Jupyter Notebook examples are in **mt_metadata/examples/notebooks** and **docs/source/notebooks**

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/__init__.py

@@ -39,7 +39,7 @@ you should only have to changes these dictionaries.
 
 __author__ = """Jared Peacock"""
 __email__ = "jpeacock@usgs.gov"
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 
 # =============================================================================
 # Imports

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/base/metadata.py

@@ -300,7 +300,7 @@ class Base:
             self.logger.exception(error)
             raise MTSchemaError(error)
 
-    def _validate_option(self, name, option_list):
+    def _validate_option(self, name, value, option_list):
         """
         validate the given attribute name agains possible options and check
         for aliases
@@ -315,21 +315,21 @@ class Base:
         :rtype: TYPE
 
         """
-        if name is None:
+        if value is None:
             return True, False, None
         options = [ss.lower() for ss in option_list]
         other_possible = False
         if "other" in options:
             other_possible = True
-        if name.lower() in options:
+        if value.lower() in options:
             return True, other_possible, None
-        elif name.lower() not in options and other_possible:
+        elif value.lower() not in options and other_possible:
             msg = (
-                "{0} not found in options list {1}, but other options"
-                + " are allowed.  Allowing {2} to be set to {0}."
+                f"Value '{value}' not found for metadata field '{name}' in options list {option_list}, but other options"
+                + f" are allowed.  Allowing {option_list} to be set to {value}."
             )
             return True, other_possible, msg
-        return False, other_possible, "{0} not found in options list {1}"
+        return False, other_possible, f"Value '{value}' for metadata field '{name}' not found in options list {option_list}"
 
     def __setattr__(self, name, value):
         """
@@ -399,7 +399,7 @@ class Base:
                 # check options
                 if v_dict["style"] == "controlled vocabulary":
                     options = v_dict["options"]
-                    accept, other, msg = self._validate_option(value, options)
+                    accept, other, msg = self._validate_option(name, value, options)
                     if not accept:
                         self.logger.error(msg.format(value, options))
                         raise MTSchemaError(msg.format(value, options))

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/timeseries/stationxml/xml_inventory_mt_experiment.py

@@ -170,7 +170,10 @@ class XMLInventoryMTExperiment:
             xml_network = self.network_translator.mt_to_xml(mt_survey)
             for mt_station in mt_survey.stations:
                 xml_station = self.station_translator.mt_to_xml(mt_station)
-                xml_station.site.country = mt_survey.country
+                if mt_survey.country is not None:
+                    xml_station.site.country = ",".join(
+                        [str(country) for country in mt_survey.country]
+                    )
                 for mt_run in mt_station.runs:
                     xml_station = self.add_run(
                         xml_station, mt_run, mt_survey.filters

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/timeseries/tools/from_many_mt_files.py

@@ -12,7 +12,14 @@ from pathlib import Path
 import pandas as pd
 from xml.etree import cElementTree as et
 
-from mt_metadata.timeseries import Experiment, Survey, Station, Run, Electric, Magnetic
+from mt_metadata.timeseries import (
+    Experiment,
+    Survey,
+    Station,
+    Run,
+    Electric,
+    Magnetic,
+)
 
 from mt_metadata.timeseries.filters import (
     PoleZeroFilter,
@@ -22,6 +29,7 @@ from mt_metadata.timeseries.filters import (
 )
 from mt_metadata.timeseries.stationxml import XMLInventoryMTExperiment
 
+
 # =============================================================================
 # Useful Class
 # =============================================================================
@@ -182,7 +190,7 @@ class MT2StationXML(XMLInventoryMTExperiment):
         channels_list = []
         for ch in order:
             for fn in rdf:
-                if ch in fn.name.lower():
+                if ch in fn.name[len(station) :].lower():
                     channels_list.append(fn)
                     break
 
@@ -196,7 +204,11 @@ class MT2StationXML(XMLInventoryMTExperiment):
         :rtype: TYPE
 
         """
-        fn_dict = {"survey": self.survey, "filters": self.filters, "stations": []}
+        fn_dict = {
+            "survey": self.survey,
+            "filters": self.filters,
+            "stations": [],
+        }
         if stations in [None, []]:
             station_iterator = self.stations
         else:

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/transfer_functions/processing/aurora/band.py

@@ -24,6 +24,7 @@ class Band(Base):
     def __init__(self, **kwargs):
 
         super().__init__(attr_dict=attr_dict, **kwargs)
+        self._name = None
 
     @property
     def lower_bound(self):
@@ -41,6 +42,21 @@ class Band(Base):
     def upper_closed(self):
         return self.to_interval().closed_right
 
+    @property
+    def name(self):
+        """
+        :return: The name of the frequency band (currently defaults to fstring with 6 decimal places.
+        :rtype: str
+        """
+        if self._name is None:
+            self._name = f"{self.center_frequency:.6f}"
+        return self._name
+
+
+    @name.setter
+    def name(self, value):
+        self._name = value
+
     def _indices_from_frequencies(self, frequencies):
         """
 

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata/transfer_functions/processing/fourier_coefficients/standards/decimation.json

@@ -4,7 +4,7 @@
         "required": true,
         "style": "number",
         "units": null,
-        "description": "Decimation level, must be a positive integer starting at 0.",
+        "description": "Decimation level, must be a non-negative integer starting at 0",
         "options": [],
         "alias": [],
         "example": "1",

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/mt_metadata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mt-metadata
-Version: 0.3.4
+Version: 0.3.5
 Summary: Metadata for magnetotelluric data
 Home-page: https://github.com/kujaku11/mt_metadata
 Author: Jared Peacock
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.rst
 
-# mt_metadata version 0.3.4
+# mt_metadata version 0.3.5
  Standard MT metadata
 
 [![PyPi version](https://img.shields.io/pypi/v/mt_metadata.svg)](https://pypi.python.org/pypi/mt-metadata)
@@ -52,7 +52,7 @@ MT Metadata is a project led by [IRIS-PASSCAL MT Software working group](https:/
 
 Most people will be using the transfer functions, but a lot of that metadata comes from the time series metadata.  This module supports both and has tried to make them more or less seamless to reduce complication.
 
-* **Version**: 0.3.4
+* **Version**: 0.3.5
 * **Free software**: MIT license
 * **Documentation**: https://mt-metadata.readthedocs.io.
 * **Examples**: Click the `Binder` badge above and Jupyter Notebook examples are in **mt_metadata/examples/notebooks** and **docs/source/notebooks**

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/setup.py

@@ -56,7 +56,7 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/kujaku11/mt_metadata",
-    version="0.3.4",
+    version="0.3.5",
     zip_safe=False,
     package_data={
         "": [

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/tests/test_standards_exist.py

@@ -14,9 +14,13 @@ from pathlib import Path
 
 
 def get_standard_dirs(dir_path):
-    existing_dirs = list(set([fn.parent.as_posix() for fn in dir_path.rglob("*.json")]))
+    existing_dirs = list(
+        set([fn.parent.as_posix() for fn in dir_path.rglob("*.json")])
+    )
     existing_dirs = [
-        fn[fn.rfind("mt_metadata") :] for fn in existing_dirs if ".git" not in fn
+        fn[fn.rfind("mt_metadata") :]
+        for fn in existing_dirs
+        if ".git" not in fn
     ]
 
     return sorted(set(existing_dirs))
@@ -41,7 +45,7 @@ class TestStandards(unittest.TestCase):
             self.manifest_fn = self.home.parent.joinpath("MANIFEST.in")
 
     def test_standards_exist(self):
-        existing_dirs = get_standard_dirs(self.home)
+        existing_dirs = get_standard_dirs(self.home.joinpath(self.home.name))
         manifest_dirs = read_manifest(self.manifest_fn)
         self.assertListEqual(existing_dirs, manifest_dirs)
 

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/tests/tf/io/edi/test_no_error_edi.py

@@ -43,7 +43,7 @@ class TestNoErrorEDI(unittest.TestCase):
                 ("longitude", 0.0),
                 ("progdate", "2013-07-03"),
                 ("progname", "mt_metadata"),
-                ("progvers", "0.3.4"),
+                ("progvers", "0.3.5"),
                 ("stdvers", "SEG 1.0"),
                 ("units", "millivolts_per_kilometer_per_nanotesla"),
             ]

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/tests/tf/processing/aurora/test_band.py

@@ -44,6 +44,10 @@ class TestBandDefault(unittest.TestCase):
             frequency_min=self.min_freq, frequency_max=self.max_freq
         )
 
+    def test_copy(self):
+        cloned = self.band.copy()
+        self.assertEqual(self.band, cloned)
+        
     def test_lower_bound(self):
         self.assertEqual(self.band.lower_bound, self.min_freq)
 
@@ -96,6 +100,10 @@ class TestBandDefault(unittest.TestCase):
         with self.subTest("period"):
             self.assertAlmostEqual(self.band.center_period, 1.0 / 2.5)
 
+    def test_name(self):
+        self.assertTrue(isinstance(self.band.name, str))
+
+
 
 class TestBandClosedRight(unittest.TestCase):
     @classmethod

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/tests/timeseries/stationxml/test_experiment_to_stationxml.py

@@ -182,6 +182,17 @@ class TestExperiment2StationXML02(unittest.TestCase):
             c_end = [c.end_date for c in self.inventory.networks[0].stations]
             self.assertTrue(self.inventory.networks[0].end_date >= max(c_end))
 
+    def test_country_is_string(self):
+        with self.subTest("is string"):
+            self.assertIsInstance(
+                self.inventory.networks[0].stations[0].site.country, str
+            )
+
+        with self.subTest("is equal"):
+            self.assertEqual(
+                self.inventory.networks[0].stations[0].site.country, "USA"
+            )
+
 
 # =============================================================================
 # Run

{mt_metadata-0.3.4 → mt_metadata-0.3.5}/tests/timeseries/test_experiment.py

@@ -95,7 +95,7 @@ class TestBuildExperiment(unittest.TestCase):
         kwargs = {"time_period.start": self.start, "time_period.end": self.end}
 
         for survey in ["One", "Two"]:
-            survey_obj = Survey(id=survey)
+            survey_obj = Survey(id=survey, country="USA")
             survey_obj.filters = {}
             for station in ["mt01", "mt02"]:
                 station_obj = Station(id=station, **kwargs)
@@ -121,9 +121,8 @@ class TestBuildExperiment(unittest.TestCase):
         experiment_xml = self.experiment.to_xml(required=True)
         experiment_02 = Experiment()
         experiment_02.from_xml(element=experiment_xml)
-        self.assertDictEqual(
-            self.experiment.to_dict(), experiment_02.to_dict()
-        )
+
+        self.assertDictEqual(self.experiment.to_dict(), experiment_02.to_dict())
 
     def test_survey_time_period(self):
         with self.subTest("start"):
@@ -200,7 +199,6 @@ class TestBuildExperiment(unittest.TestCase):
             )
 
     def test_from_dict(self):
-
         d = self.experiment.to_dict()
         ex = Experiment()
         ex.from_dict(d, skip_none=False)