From f9b2f639883763d4c1ae8d22b87533ebca089501 Mon Sep 17 00:00:00 2001 From: Stephanie Ribet Date: Thu, 29 Aug 2024 11:04:40 -0700 Subject: [PATCH 1/2] numpy less than 2 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 28b16692a..ba70c9072 100644 --- a/setup.py +++ b/setup.py @@ -23,11 +23,11 @@ keywords="STEM,4DSTEM", python_requires=">=3.10", install_requires=[ - "numpy >= 1.19", + "numpy >= 1.19, < 2.0", "scipy >= 1.5.2", "h5py >= 3.2.0", "hdf5plugin >= 4.1.3", - "ncempy >= 1.8.1", + "ncempy >= 1.8.1, < 1.11.2", "matplotlib >= 3.2.2", "scikit-image >= 0.17.2", "scikit-learn >= 0.23.2, < 1.5", From e1c74f0267cd52c961562d934ed0323a6689f4e5 Mon Sep 17 00:00:00 2001 From: Stephanie Ribet Date: Thu, 29 Aug 2024 15:39:44 -0700 Subject: [PATCH 2/2] pymatgen and ncempy updates --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ba70c9072..8919e53e8 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ "scipy >= 1.5.2", "h5py >= 3.2.0", "hdf5plugin >= 4.1.3", - "ncempy >= 1.8.1, < 1.11.2", + "ncempy >= 1.8.1, <= 1.11.2", "matplotlib >= 3.2.2", "scikit-image >= 0.17.2", "scikit-learn >= 0.23.2, < 1.5", @@ -46,7 +46,7 @@ extras_require={ "ipyparallel": ["ipyparallel >= 6.2.4", "dill >= 0.3.3"], "cuda": ["cupy >= 10.0.0"], - "acom": ["pymatgen >= 2022", "mp-api == 0.24.1"], + "acom": ["pymatgen >= 2022, < 2024.8.9", "mp-api == 0.24.1"], "aiml": [ "tensorflow <= 2.10.0", "tensorflow-addons <= 0.16.1",