seabirdfilehandler 0.7.5__tar.gz → 0.7.7__tar.gz

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seabirdfilehandler
-Version: 0.7.5
+Version: 0.7.7
 Summary: Library of parsers to interact with SeaBird CTD files.
 License-File: LICENSE
 Keywords: CTD,parser,seabird,data
@@ -15,7 +15,19 @@ Classifier: Topic :: Scientific/Engineering :: Oceanography
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Provides-Extra: docs
+Provides-Extra: test
+Requires-Dist: myst-parser (>=4.0.1) ; extra == "docs"
 Requires-Dist: pandas (>=2.2.1)
+Requires-Dist: parameterized (>=0.9.0) ; extra == "test"
+Requires-Dist: pre-commit (>=3.6.2) ; extra == "docs"
+Requires-Dist: pre-commit (>=3.6.2) ; extra == "test"
+Requires-Dist: pyment (>=0.3.3) ; extra == "docs"
+Requires-Dist: pytest (>=8.3.0) ; extra == "test"
+Requires-Dist: sphinx (>=8.2.3) ; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints (>=1.24.1) ; extra == "docs"
+Requires-Dist: sphinx-rtd-theme (>=1.3.0) ; extra == "docs"
 Requires-Dist: xmltodict (>=0.13.0)
 Project-URL: Documentation, https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler
 Project-URL: Homepage, https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/pyproject.toml

@@ -15,49 +15,35 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 urls.homepage = "https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler"
 urls.repository = "https://git.io-warnemuende.de/CTD-Software/SeabirdFileHandler"
 urls.documentation = "https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler"
 dynamic = []
-version = "0.7.5"
+requires-python = ">=3.12"
+dependencies = ["pandas>=2.2.1", "xmltodict>=0.13.0"]
+version = "0.7.7"
+
+[project.optional-dependencies]
+test = ["pytest>=8.3.0", "parameterized>=0.9.0", "pre-commit>=3.6.2"]
+docs = [
+    "pre-commit>=3.6.2",
+    "sphinx>=8.2.3",
+    "sphinx-rtd-theme>=1.3.0",
+    "sphinx-autodoc-typehints>=1.24.1",
+    "myst-parser>=4.0.1",
+    "pyment>=0.3.3",
+]
 
 [tool.poetry]
 
 [tool.poetry.requires-plugins]
 poetry-dynamic-versioning = { version = ">=1.0.0,<2.0.0", extras = ["plugin"] }
 
-[tool.poetry.dependencies]
-python = ">=3.12"
-pandas = ">=2.2.1"
-xmltodict = ">=0.13.0"
-
-[tool.poetry.group.dev.dependencies]
-pytest = ">=8.3.0"
-pytest-xdist = ">=3.6.1"
-pytest-cov = ">=6.0.0"
-parameterized = ">=0.9.0"
-sphinx = ">=8.2.3"
-sphinx-rtd-theme = ">=1.3.0"
-sphinx-autodoc-typehints = ">=1.24.1"
-pyment = ">=0.3.3"
-pylint = ">=3.0.2"
-pre-commit = ">=3.6.2"
-tomlkit = ">=0.13.2"
-myst-parser = "^4.0.1"
-
 [tool.pytest.ini_options]
 pythonpath = [".", "src", "src/seabirdfilehandler"]
-filterwarnings = [
-    "error",
-    "ignore::UserWarning",
-    'ignore::DeprecationWarning',
-    # note the use of single quote below to denote "raw" strings in TOML
-    'ignore: datetime.datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning',
-]
-
-[tool.coverage.run]
-omit = ["tests/*"]
+filterwarnings = ["error", "ignore::FutureWarning"]
 
 [tool.ruff]
 line-length = 79
@@ -65,7 +51,6 @@ line-length = 79
 [tool.ruff.lint]
 ignore = ["F403", "F821"]
 
-
 [tool.poetry-dynamic-versioning]
 enable = false
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/bottlefile.py

@@ -1,9 +1,11 @@
+import logging
+from datetime import datetime, time
 from pathlib import Path
 from typing import Union
-from datetime import datetime, time
-import pandas as pd
+
 import numpy as np
-import logging
+import pandas as pd
+
 from seabirdfilehandler import DataFile
 
 logger = logging.getLogger(__name__)

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/bottlelogfile.py

@@ -1,7 +1,9 @@
-from datetime import datetime
-import re
 import logging
+import re
+from datetime import datetime
+
 import pandas as pd
+
 from seabirdfilehandler import DataFile
 
 logger = logging.getLogger(__name__)

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/cnvfile.py

@@ -1,9 +1,11 @@
-from pathlib import Path
+import logging
 from datetime import datetime, timedelta
-import pandas as pd
+from pathlib import Path
+
 import numpy as np
-import logging
-from seabirdfilehandler import DataFile, Parameters, CnvProcessingSteps
+import pandas as pd
+
+from seabirdfilehandler import CnvProcessingSteps, DataFile, Parameters
 
 logger = logging.getLogger(__name__)
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/datafiles.py

@@ -1,8 +1,9 @@
+import logging
 from pathlib import Path
-import xmltodict
-import pandas as pd
+
 import numpy as np
-import logging
+import pandas as pd
+import xmltodict
 
 logger = logging.getLogger(__name__)
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/file_collection.py

@@ -1,15 +1,18 @@
 from __future__ import annotations
-from pathlib import Path
+
 import logging
+import warnings
 from collections import UserList
+from pathlib import Path
 from typing import Callable, Type
-import warnings
-import pandas as pd
+
 import numpy as np
+import pandas as pd
+
 from seabirdfilehandler import (
-    CnvFile,
     BottleFile,
     BottleLogFile,
+    CnvFile,
     DataFile,
     HexFile,
 )
@@ -157,10 +160,13 @@ class FileCollection(UserList):
         -------
         A list of all paths found.
         """
-        return sorted(
-            self.path_to_files.rglob(f"*{pattern}*{self.file_suffix}"),
-            key=sorting_key,
-        )
+        if self.path_to_files.is_file():
+            return [self.path_to_files]
+        else:
+            return sorted(
+                self.path_to_files.rglob(f"*{pattern}*{self.file_suffix}"),
+                key=sorting_key,
+            )
 
     def load_files(self, only_metadata: bool = False) -> list[DataFile]:
         """
@@ -304,10 +310,8 @@ class FileCollection(UserList):
         for parameter in df.columns:
             if parameter in ["datetime"]:
                 continue
-            try:
-                df[parameter] = df[parameter].astype("float")
-            finally:
-                continue
+            df[parameter] = df[parameter].astype("float")
+            continue
         return df
 
     def select_real_scan_data(self, df: pd.DataFrame) -> pd.DataFrame:

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/geomar_ctd_file_parser.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 import pandas as pd
 
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/hexfile.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from seabirdfilehandler import DataFile, XMLCONFile
 
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/parameter.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
-from typing import Tuple
+
+import logging
 import re
 from collections import UserDict
+from typing import Tuple
+
 import numpy as np
 import pandas as pd
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -153,10 +155,10 @@ class Parameters(UserDict):
         post = []
         for line in self.raw_metadata:
             if line.startswith("name"):
-                column_names.append(line.split("=")[1].strip())
+                column_names.append(line.split("=", 1)[1].strip())
             elif line.startswith("span"):
                 past_spans = True
-                column_value_spans.append(line.split("=")[1].strip())
+                column_value_spans.append(line.split("=", 1)[1].strip())
             else:
                 if not past_spans:
                     pre.append(line)
@@ -164,7 +166,7 @@ class Parameters(UserDict):
                     post.append(line)
         assert len(column_names) == len(column_value_spans)
         self.data_table_stats = {
-            line.split("=")[0].strip(): line.split("=")[1].strip()
+            line.split("=")[0].strip(): line.split("=", 1)[1].strip()
             for line in pre
         }
         self.data_table_names_and_spans = [
@@ -172,7 +174,7 @@ class Parameters(UserDict):
             for name, span in zip(column_names, column_value_spans)
         ]
         self.data_table_misc = {
-            line.split("=")[0].strip(): line.split("=")[1].strip()
+            line.split("=")[0].strip(): line.split("=", 1)[1].strip()
             for line in post
         }
 

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/processing_steps.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
-from collections import UserList
+
 import copy
+from collections import UserList
 
 
 class CnvProcessingSteps(UserList):
@@ -149,8 +150,7 @@ class CnvProcessingSteps(UserList):
             pass
         else:
             dictionary[key.strip()] = value.strip()
-        finally:
-            return dictionary
+        return dictionary
 
     def get_step(self, step: str) -> ProcessingStep | None:
         """

{seabirdfilehandler-0.7.5 → seabirdfilehandler-0.7.7}/src/seabirdfilehandler/xmlfiles.py

@@ -1,7 +1,8 @@
-from pathlib import Path
-from collections import UserDict
-import xml.etree.ElementTree as ET
 import json
+import xml.etree.ElementTree as ET
+from collections import UserDict
+from pathlib import Path
+
 import xmltodict
 
 from seabirdfilehandler.utils import UnexpectedFileFormat