bugfix and changelog update (#282)

skuschel · Jul 11, 2024 · 3fbd14e · 3fbd14e
2 parents a304e73 + 9f378d8
commit 3fbd14e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,13 @@ current master
 
 **Incompatible adjustments to previous version**
 
+* `scipy.integrate.simps` has been removed in scipy 1.14. Postpic uses `scipy.integrate.simpson` which has been introduced in scipy 1.6.0 (Dec 31st 2020).
 
 
 **Other improvements and new features**
 
+* Compatibility with numpy 2.0 and the sanitizer checks of numexpr 2.8.6. ([#281](https://github.com/skuschel/postpic/pull/281) -- [a304e73](https://github.com/skuschel/postpic/commit/a304e7370259b3b09873a998ccc8f6a6c0241b2c))
+
 
 v0.5
 ----

diff --git a/postpic/particles/scalarproperties.py b/postpic/particles/scalarproperties.py
@@ -175,7 +175,7 @@ def __call__(self, expr):
     ScalarProperty('y', 'y', 'm'),
     ScalarProperty('y * 1e6', 'y_um', r'$\mu$ m'),
     ScalarProperty('z', 'z', 'm'),
-    ScalarProperty('y * 1e6', 'z_um', r'$\mu$ m'),
+    ScalarProperty('z * 1e6', 'z_um', r'$\mu$ m'),
     ScalarProperty('px', 'px', 'kg*m/s'),
     ScalarProperty('py', 'py', 'kg*m/s'),
     ScalarProperty('pz', 'pz', 'kg*m/s'),

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
                         # ndarray.tobytes was introduced in np 1.9 and workaround in vtk routines
                         # does not work for python 2
                         'numpy>=1.8', 'numpy>=1.9;python_version<"3.0"',
-                        'scipy', 'future', 'urllib3', 'numexpr',
+                        'scipy>=1.6', 'future', 'urllib3', 'numexpr',
                         'cython>=0.18', 'functools32;python_version<"3.0"',
                         'packaging'],
       extras_require = {