Pin numpy version (#58)

Author: hanne-opseth-rygg-4ss

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 
-### This PR is related to user story DST-
+### This PR is related to user story [ESS-XXXX](url_to_jira_task)
 
 ## Description
 Provide a short description about the work that has been done.

.github/workflows/ci.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"] 
+        python-version: ["3.9", "3.10", "3.11"] 
 
     steps:
       - uses: actions/checkout@v2
@@ -36,4 +36,4 @@ jobs:
 
       - name: Test doc build with tox
         run: tox -e docs
-        if: ${{ (matrix.python-version == '3.9') && (matrix.os == 'ubuntu-latest')}}
+        if: ${{ (matrix.python-version == '3.10') && (matrix.os == 'ubuntu-latest')}}

.github/workflows/deploy_public.yml

@@ -35,10 +35,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install dependencies
         run: |

pyproject.toml

@@ -11,19 +11,20 @@ dynamic = ["version"]
 description = "Vessel motion and wave utilities"
 readme = "README.md"
 license = { file="LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "License :: OSI Approved :: MIT License",
     "Operating System :: Unix", 
     "Operating System :: Microsoft :: Windows",
 ]
 dependencies = [
-    "numpy",
+    "numpy<2.0.0",
     "pandas",
     "scipy",
+    "pyarrow"
 ]
 
 [project.urls]
@@ -53,7 +54,7 @@ deps =
     pytest-cov
 
 [testenv:docs]
-basepython = python3.9
+basepython = python3.10
 commands = sphinx-build -W -b html -d {toxworkdir}/docs_doctree docs {toxworkdir}/docs_out
 deps =
     sphinx==5.3.0

src/waveresponse/_core.py

@@ -3,7 +3,7 @@
 from numbers import Number
 
 import numpy as np
-from scipy.integrate import trapz
+from scipy.integrate import trapezoid
 from scipy.interpolate import interp2d
 from scipy.special import gamma
 
@@ -1392,7 +1392,7 @@ def var(self):
         x = self._full_range_dir(self._dirs)
         y = self._freq
         zz = self.interpolate(y, x, freq_hz=False, degrees=False)
-        return trapz([trapz(zz_x, x) for zz_x in zz], y)
+        return trapezoid([trapezoid(zz_x, x) for zz_x in zz], y)
 
     def std(self):
         """
@@ -1452,7 +1452,7 @@ def spectrum1d(self, axis=1, freq_hz=None, degrees=None):
         else:
             raise ValueError("'axis' must be 0 or 1.")
 
-        spectrum = np.array([trapz(zz_y, y) for zz_y in zz])
+        spectrum = np.array([trapezoid(zz_y, y) for zz_y in zz])
         return x, spectrum
 
     def moment(self, n, freq_hz=None):
@@ -1484,7 +1484,7 @@ def moment(self, n, freq_hz=None):
 
         """
         f, spectrum = self.spectrum1d(axis=1, freq_hz=freq_hz)
-        m_n = trapz((f**n) * spectrum, f)
+        m_n = trapezoid((f**n) * spectrum, f)
         return m_n
 
     @property
@@ -1618,8 +1618,8 @@ def _mean_direction(dirs, spectrum):
         spectrum : array-like
             1-D spectrum directional distribution.
         """
-        sin = trapz(np.sin(dirs) * spectrum, dirs)
-        cos = trapz(np.cos(dirs) * spectrum, dirs)
+        sin = trapezoid(np.sin(dirs) * spectrum, dirs)
+        cos = trapezoid(np.cos(dirs) * spectrum, dirs)
         return _robust_modulus(np.arctan2(sin, cos), 2.0 * np.pi)
 
     def dirp(self, degrees=None):

tests/test_core.py

@@ -3346,7 +3346,7 @@ def test_moment_m2_hz(self):
 
         m_expect = (1.0 / 3.0) * (0.0 - 360.0) * (f0**3 - f1**3)
 
-        # not exactly same due to error in trapz for higher order functions
+        # not exactly same due to error in trapezoid for higher order functions
         assert m_out == pytest.approx(m_expect, rel=0.1)
 
     def test_moment_m2_rads(self):
@@ -3364,7 +3364,7 @@ def test_moment_m2_rads(self):
             (1.0 / 3.0) * (0.0 - 360.0) * (f0**3 - f1**3) * (2.0 * np.pi) ** 2
         )
 
-        # not exactly same due to error in trapz for higher order functions
+        # not exactly same due to error in trapezoid for higher order functions
         assert m_out == pytest.approx(m_expect, rel=0.1)
 
     def test_tz(self):

tests/test_standardized1d.py

@@ -182,10 +182,10 @@ def test__call__var(self):
         spectrum = wr.ModifiedPiersonMoskowitz(freq)
 
         freq_rad, ps_rad = spectrum(3.5, 10.0, freq_hz=False)
-        var_rad = integrate.trapz(ps_rad, freq_rad)
+        var_rad = integrate.trapezoid(ps_rad, freq_rad)
 
         freq_hz, ps_hz = spectrum(3.5, 10.0, freq_hz=True)
-        var_hz = integrate.trapz(ps_hz, freq_hz)
+        var_hz = integrate.trapezoid(ps_hz, freq_hz)
 
         assert var_rad == pytest.approx(var_hz)
 
@@ -212,10 +212,10 @@ def test__call__var(self):
         spectrum = wr.JONSWAP(freq)
 
         freq_rad, ps_rad = spectrum(3.5, 10.0, freq_hz=False)
-        var_rad = integrate.trapz(ps_rad, freq_rad)
+        var_rad = integrate.trapezoid(ps_rad, freq_rad)
 
         freq_hz, ps_hz = spectrum(3.5, 10.0, freq_hz=True)
-        var_hz = integrate.trapz(ps_hz, freq_hz)
+        var_hz = integrate.trapezoid(ps_hz, freq_hz)
 
         assert var_rad == pytest.approx(var_hz)
 
@@ -385,10 +385,10 @@ def test__call__var(self):
         spectrum = wr.OchiHubble(freq)
 
         freq_rad, ps_rad = spectrum(3.5, 10.0, freq_hz=False)
-        var_rad = integrate.trapz(ps_rad, freq_rad)
+        var_rad = integrate.trapezoid(ps_rad, freq_rad)
 
         freq_hz, ps_hz = spectrum(3.5, 10.0, freq_hz=True)
-        var_hz = integrate.trapz(ps_hz, freq_hz)
+        var_hz = integrate.trapezoid(ps_hz, freq_hz)
 
         assert var_rad == pytest.approx(var_hz)
 
@@ -598,10 +598,10 @@ def test__call__var(self):
         spectrum = wr.Torsethaugen(freq)
 
         freq_rad, ps_rad = spectrum(3.5, 10.0, freq_hz=False)
-        var_rad = integrate.trapz(ps_rad, freq_rad)
+        var_rad = integrate.trapezoid(ps_rad, freq_rad)
 
         freq_hz, ps_hz = spectrum(3.5, 10.0, freq_hz=True)
-        var_hz = integrate.trapz(ps_hz, freq_hz)
+        var_hz = integrate.trapezoid(ps_hz, freq_hz)
 
         assert var_rad == pytest.approx(var_hz)