wavespectra 4.4.2__tar.gz → 4.4.3__tar.gz

{wavespectra-4.4.2/wavespectra.egg-info → wavespectra-4.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wavespectra
-Version: 4.4.2
+Version: 4.4.3
 Summary: Library for ocean wave spectra
 Author-email: Wavespectra Developers <r.guedes@oceanum.science>
 Maintainer-email: Rafael Guedes <r.guedes@oceanum.science>, Tom Durrant <t.durrant@oceanum.science>
@@ -63,6 +63,7 @@ Requires-Dist: fsspec; extra == "extra"
 Requires-Dist: gcsfs; extra == "extra"
 Requires-Dist: h5netcdf; extra == "extra"
 Requires-Dist: netCDF4; extra == "extra"
+Requires-Dist: tbump; extra == "extra"
 Requires-Dist: zarr; extra == "extra"
 Provides-Extra: docs
 Requires-Dist: cmocean; extra == "docs"

{wavespectra-4.4.2 → wavespectra-4.4.3}/pyproject.toml

@@ -78,6 +78,7 @@ extra = [
     "gcsfs",
     "h5netcdf",
     "netCDF4",
+    "tbump",
     "zarr",
 ]
 docs = [
@@ -131,6 +132,24 @@ line-ending = "auto"
 "wavespectra/input/wavespectra.py" = ["F401"]
 "wavespectra/input/xwaves.py" = ["F401"]
 
+[tool.tbump]
+github_url = "https://github.com/wavespectra/wavespectra/"
+
+[tool.tbump.version]
+current = "4.4.3"
+regex = '''
+  (?P<major>\d+)
+  \.(?P<minor>\d+)
+  \.(?P<patch>\d+)
+  '''
+
+[tool.tbump.git]
+message_template = "Bump to {new_version}"
+tag_template = "v{new_version}"
+
+[[tool.tbump.file]]
+src = "wavespectra/__init__.py"
+
 [tool.tox]
 legacy_tox_ini = """
     [tox]

{wavespectra-4.4.2 → wavespectra-4.4.3}/wavespectra/__init__.py

@@ -14,7 +14,7 @@ except ImportError:
     warnings.warn("Cannot import accessors at the main module level")
 
 
-__version__ = "4.4.2"
+__version__ = "4.4.3"
 
 
 def _import_functions(pkgname="input", prefix="read"):

{wavespectra-4.4.2 → wavespectra-4.4.3}/wavespectra/core/swan.py

@@ -69,9 +69,12 @@ class SwanSpecFile(object):
                 "LOCATIONS", True
             )
             for ip in locs:
-                xy = [float(val) for val in ip.split()]
-                self.x.append(xy[0])
-                self.y.append(xy[1])
+                # Only the first two tokens are the x/y coordinates. SWAN allows
+                # an optional location name to follow them in the header, which
+                # is ignored by SWAN when reading the file (see #84).
+                xy = ip.split()
+                self.x.append(float(xy[0]))
+                self.y.append(float(xy[1]))
             self.x = np.array(self.x)
             self.y = np.array(self.y)
             self.afreq = self._read_header("AFREQ", True)

{wavespectra-4.4.2 → wavespectra-4.4.3}/wavespectra/input/ndbc_ascii.py

@@ -35,7 +35,12 @@ def read_file(filename):
         df = pd.read_csv(f, delimiter=r"\s+", compression=compressed, header=None)
         df.index = pd.to_datetime(df[date_columns.keys()].rename(columns=date_columns))
         df = df.iloc[:, list(date_columns.keys())[-1] + 1 :]
-        freqcols = df.select_dtypes(object)  # Get all columns with the frequency
+        try:
+            # pandas 3+: "str" selects StringDtype columns; "object" selects legacy string columns
+            freqcols = df.select_dtypes(include=["object", "str"])
+        except TypeError:
+            # pandas 2: "str" is not a recognised dtype — object covers string columns
+            freqcols = df.select_dtypes(include=["object"])
         if not (freqcols.nunique() == 1).all():
             raise IOError("NDBC file has varying frequencies in same file")
         freqs = freqcols.iloc[0].apply(

{wavespectra-4.4.2 → wavespectra-4.4.3/wavespectra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wavespectra
-Version: 4.4.2
+Version: 4.4.3
 Summary: Library for ocean wave spectra
 Author-email: Wavespectra Developers <r.guedes@oceanum.science>
 Maintainer-email: Rafael Guedes <r.guedes@oceanum.science>, Tom Durrant <t.durrant@oceanum.science>
@@ -63,6 +63,7 @@ Requires-Dist: fsspec; extra == "extra"
 Requires-Dist: gcsfs; extra == "extra"
 Requires-Dist: h5netcdf; extra == "extra"
 Requires-Dist: netCDF4; extra == "extra"
+Requires-Dist: tbump; extra == "extra"
 Requires-Dist: zarr; extra == "extra"
 Provides-Extra: docs
 Requires-Dist: cmocean; extra == "docs"

{wavespectra-4.4.2 → wavespectra-4.4.3}/wavespectra.egg-info/requires.txt

@@ -24,6 +24,7 @@ fsspec
 gcsfs
 h5netcdf
 netCDF4
+tbump
 zarr
 
 [test]