seabirdfilehandler 0.7.2__tar.gz → 0.7.4__tar.gz

{seabirdfilehandler-0.7.2 → seabirdfilehandler-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: seabirdfilehandler
-Version: 0.7.2
+Version: 0.7.4
 Summary: Library of parsers to interact with SeaBird CTD files.
 Keywords: CTD,parser,seabird,data
 Author: Emil Michels

{seabirdfilehandler-0.7.2 → seabirdfilehandler-0.7.4}/pyproject.toml

@@ -20,7 +20,7 @@ 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.2"
+version = "0.7.4"
 
 [tool.poetry]
 

{seabirdfilehandler-0.7.2 → seabirdfilehandler-0.7.4}/src/seabirdfilehandler/cnvfile.py

@@ -160,14 +160,14 @@ class CnvFile(DataFile):
     def array2cnv(self) -> list:
         result = []
         for row in self.parameters.full_data_array:
-            formatted_row = "".join(elem.rjust(11) for elem in row)
+            formatted_row = "".join(str(elem).rjust(11) for elem in row)
             result.append(formatted_row + "\n")
         return result
 
     def to_cnv(
         self,
         file_name: Path | str | None = None,
-        use_dataframe: bool = True,
+        use_dataframe: bool = False,
     ):
         """
         Writes the values inside of this instance as a new cnv file to disc.

{seabirdfilehandler-0.7.2 → seabirdfilehandler-0.7.4}/src/seabirdfilehandler/datafiles.py

@@ -4,16 +4,6 @@ import pandas as pd
 import numpy as np
 import logging
 
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - [%(levelname)s] - %(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S",
-    handlers=[
-        logging.FileHandler("filehandler.log"),
-        logging.StreamHandler(),
-    ],
-)
-
 logger = logging.getLogger(__name__)
 
 

{seabirdfilehandler-0.7.2 → seabirdfilehandler-0.7.4}/src/seabirdfilehandler/parameter.py

@@ -78,7 +78,7 @@ class Parameters(UserDict):
                     for i in range(0, len(line) - n, n)
                 ]
             )
-        return np.array(row_list, dtype="str")
+        return np.array(row_list, dtype=float)
 
     def create_parameter_instances(
         self,
@@ -205,10 +205,11 @@ class Parameters(UserDict):
             parameter.name: parameter.metadata
             for parameter in self.data.values()
         }
-        # add to full numpy data array
-        self.full_data_array = np.insert(
-            self.full_data_array, position_index, parameter.data, axis=1
-        )
+        # add to the data array if data
+        if parameter.type == "data":
+            self.full_data_array = np.insert(
+                self.full_data_array, position_index, parameter.data, axis=1
+            )
 
     def create_parameter(
         self,
@@ -449,6 +450,7 @@ class Parameter:
         self.data = data
         self.metadata = metadata
         self.name = metadata["shortname"]
+        self.type = "data" if self.data.dtype in ["float", "int"] else "meta"
         self.parse_to_float()
         self.update_span()