From 9379058dc4fba372a99b1a43483cdb552d002bca Mon Sep 17 00:00:00 2001 From: Stephan Kuschel Date: Tue, 9 Jul 2024 23:26:36 +0200 Subject: [PATCH 1/3] bugfix a typo in scalarproperties fix #280 --- postpic/particles/scalarproperties.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postpic/particles/scalarproperties.py b/postpic/particles/scalarproperties.py index f94286a..45a1ddb 100644 --- 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'), From 72a3e296a99d63fc486c037d12fe49a5aa7d4966 Mon Sep 17 00:00:00 2001 From: Stephan Kuschel Date: Tue, 9 Jul 2024 23:49:31 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3330c1c..b68e3c4 100644 --- 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 ---- From 9f378d8b6b07bbbeadbce042cf24d56fb8bc2f40 Mon Sep 17 00:00:00 2001 From: Stephan Kuschel Date: Tue, 9 Jul 2024 23:58:47 +0200 Subject: [PATCH 3/3] require scipy>=1.6 because of scipy.integrate.simpson --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f580b4f..2640727 100755 --- 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 = {