Add python 3.12

.github/workflows/check.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - name: Checkout sources

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - name: Checkout sources

redpic/accelerator/base.py

@@ -118,8 +118,8 @@ def read_fields(beamline: dict, z: np.arange) -> interpolate.interp1d:
             F_prime = F_prime + f_prime(z)
 
             if not element.max_field == 0:
-                int_f = integrate.cumtrapz(f(z_data), z_data)[-1]
-                int_ff = integrate.cumtrapz(f(z_data) ** 2, z_data)[-1]
+                int_f = integrate.cumulative_trapezoid(f(z_data), z_data)[-1]
+                int_ff = integrate.cumulative_trapezoid(f(z_data) ** 2, z_data)[-1]
                 element.length = int_f**2 / int_ff
                 element.field = int_ff / int_f
                 element.z_start = element.z0 - element.length
@@ -131,7 +131,7 @@ def read_fields(beamline: dict, z: np.arange) -> interpolate.interp1d:
                 element.z_stop = element.z0
 
     F = interpolate.interp1d(z, F, kind="cubic", fill_value=(0, 0), bounds_error=False)
-    F_int = integrate.cumtrapz(F(z), z)
+    F_int = integrate.cumulative_trapezoid(F(z), z)
     F_prime = interpolate.interp1d(z, F_prime, kind="cubic", fill_value=(0, 0), bounds_error=False)
     F_int = interpolate.interp1d(z[1:], F_int, kind="cubic", fill_value=(F_int[0], F_int[-1]), bounds_error=False)
 

requirements/base.txt

@@ -1,6 +1,6 @@
-kenv==0.3.0.3
-numba==0.59.1
-numpy==1.26.0
-pandas==2.0.3
-periodictable==1.6.1
-scipy==1.11.2
+kenv>=0.3.0.3
+numba>=0.59.1
+numpy>=1.26.0
+pandas>=2.0.3
+periodictable>=1.6.1
+scipy>=1.11.2

requirements/dev.txt

@@ -1,14 +1,14 @@
 -r ./base.txt
 
-black==23.7.0
-flake8==6.1.0
-isort==5.12.0
-jupyter==1.0.0
-pylint==2.17.5
-setuptools==65.5.1
-twine==4.0.2
-wheel==0.41.2
-pytest==7.4.0
-pytest_cov==4.1.0
-holoviews==1.17.1
-matplotlib==3.7.2
+black>=23.7.0
+flake8>=6.1.0
+isort>=5.12.0
+jupyter>=1.0.0
+pylint>=2.17.5
+setuptools>=65.5.1
+twine>=4.0.2
+wheel>=0.41.2
+pytest>=7.4.0
+pytest_cov>=4.1.0
+holoviews>=1.17.1
+matplotlib>=3.7.2

setup.py

@@ -24,6 +24,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Intended Audience :: Science/Research",