Update pyproject.toml and poetry.lock

Also very minor fixes for ions and wakepotential

mbtrack2/instability/ions.py

@@ -69,7 +69,7 @@ def ion_cross_section(ring, ion):
     elif ion == "CH4":
         M02 = 4.23
         C0 = 42.85
-    elif ion == "H20":
+    elif ion == "H2O":
         M02 = 3.24
         C0 = 32.26
     else:
@@ -128,7 +128,7 @@ def ion_frequency(N,
 
     """
 
-    ion_mass = {"CO": 28, "H2": 2, "CH4": 18, "H20": 16, "CO2": 44}
+    ion_mass = {"CO": 28, "H2": 2, "CH4": 18, "H2O": 16, "CO2": 44}
 
     if dim == "y":
         pass

mbtrack2/tracking/wakepotential.py

@@ -545,7 +545,7 @@ class WakePotential(Element):
         for wake_type in self.types:
             tau0, Wp = self.get_wakepotential(bunch, wake_type)
             profile0 = getattr(self, "profile0_" + wake_type)
-            factorTD = np.trapz(Wp * profile0, tau0)
+            factorTD = np.trapezoid(Wp * profile0, tau0)
 
             if wake_type == "Wlong":
                 factorTD *= -1

pyproject.toml

@@ -8,21 +8,21 @@ readme = "README.md"
 repository = "https://gitlab.synchrotron-soleil.fr/PA/collective-effects/mbtrack2"
 
 [tool.poetry.dependencies]
-python = ">=3.9"
-numpy = "^1.21"
-pandas = ">=1.5.3"
+python = "^3.10"
+numpy = "^2.1"
+pandas = "^2.1"
 scipy = "^1.7"
 h5py = "^3.6"
-mpi4py = "^3.1"
+mpi4py = "^4.0.1"
 matplotlib = "^3.5"
 mpmath = "^1.2.1"
-accelerator-toolbox = ">= 0.5.0"
-seaborn = "^0.12"
+accelerator-toolbox = ">= 0.6.0"
+seaborn = ">= 0.12"
 
 [tool.poetry.group.dev.dependencies]
-yapf = ">= 0.29"
-isort = "5.*"
-pytest = "^7.1"
+yapf = ">= 0.43"
+isort = "^6.0.1"
+pytest = "^8.1"
 pytest-mock = ">= 3.14.0"
 
 [build-system]